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 | |
| parent | 7aa37187e3373a6cd59effa47976b7a4f166a57e (diff) | |
| download | ATCD-29f5162e78fa497cd467d3c081d5a28ec72091bf.tar.gz | |
ChangeLogTag: Thu Feb 9 16:31:17 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu>
234 files changed, 3161 insertions, 2961 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 9e0ad9e7840..4869e1622f9 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,266 @@ +Thu Feb 9 16:31:17 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> + + * TAO_IDL/include/idl_bool.h: + + Removed this file, no longer used because of changes + below. + + * TAO_IDL/tao_idl.cpp: + * TAO_IDL/ast/ast_array.cpp: + * TAO_IDL/ast/ast_attribute.cpp: + * TAO_IDL/ast/ast_component.cpp: + * TAO_IDL/ast/ast_component_fwd.cpp: + * TAO_IDL/ast/ast_constant.cpp: + * TAO_IDL/ast/ast_decl.cpp: + * TAO_IDL/ast/ast_enum.cpp: + * TAO_IDL/ast/ast_eventtype.cpp: + * TAO_IDL/ast/ast_eventtype_fwd.cpp: + * TAO_IDL/ast/ast_exception.cpp: + * TAO_IDL/ast/ast_expression.cpp: + * TAO_IDL/ast/ast_factory.cpp: + * TAO_IDL/ast/ast_generator.cpp: + * TAO_IDL/ast/ast_home.cpp: + * TAO_IDL/ast/ast_interface.cpp: + * TAO_IDL/ast/ast_interface_fwd.cpp: + * TAO_IDL/ast/ast_module.cpp: + * TAO_IDL/ast/ast_native.cpp: + * TAO_IDL/ast/ast_operation.cpp: + * TAO_IDL/ast/ast_predefined_type.cpp: + * TAO_IDL/ast/ast_recursive.cpp: + * TAO_IDL/ast/ast_redef.cpp: + * TAO_IDL/ast/ast_sequence.cpp: + * TAO_IDL/ast/ast_string.cpp: + * TAO_IDL/ast/ast_structure.cpp: + * TAO_IDL/ast/ast_structure_fwd.cpp: + * TAO_IDL/ast/ast_type.cpp: + * TAO_IDL/ast/ast_typedef.cpp: + * TAO_IDL/ast/ast_union.cpp: + * TAO_IDL/ast/ast_valuebox.cpp: + * TAO_IDL/ast/ast_valuetype.cpp: + * TAO_IDL/ast/ast_valuetype_fwd.cpp: + * TAO_IDL/be/be_argument.cpp: + * TAO_IDL/be/be_array.cpp: + * TAO_IDL/be/be_attribute.cpp: + * TAO_IDL/be/be_codegen.cpp: + * TAO_IDL/be/be_component.cpp: + * TAO_IDL/be/be_decl.cpp: + * TAO_IDL/be/be_enum.cpp: + * TAO_IDL/be/be_eventtype.cpp: + * TAO_IDL/be/be_exception.cpp: + * TAO_IDL/be/be_expression.cpp: + * TAO_IDL/be/be_generator.cpp: + * TAO_IDL/be/be_global.cpp: + * TAO_IDL/be/be_helper.cpp: + * TAO_IDL/be/be_home.cpp: + * TAO_IDL/be/be_interface.cpp: + * TAO_IDL/be/be_interface_fwd.cpp: + * TAO_IDL/be/be_native.cpp: + * TAO_IDL/be/be_operation.cpp: + * TAO_IDL/be/be_predefined_type.cpp: + * TAO_IDL/be/be_sequence.cpp: + * TAO_IDL/be/be_string.cpp: + * TAO_IDL/be/be_structure.cpp: + * TAO_IDL/be/be_sunsoft.cpp: + * TAO_IDL/be/be_type.cpp: + * TAO_IDL/be/be_typedef.cpp: + * TAO_IDL/be/be_union.cpp: + * TAO_IDL/be/be_valuetype.cpp: + * TAO_IDL/be/be_visitor_ami_pre_proc.cpp: + * TAO_IDL/be/be_visitor_arg_traits.cpp: + * TAO_IDL/be/be_visitor_ccm_pre_proc.cpp: + * TAO_IDL/be/be_visitor_context.cpp: + * TAO_IDL/be/be_visitor_scope.cpp: + * TAO_IDL/be/be_visitor_traits.cpp: + * TAO_IDL/be/be_visitor_argument/arglist.cpp: + * TAO_IDL/be/be_visitor_array/array_ci.cpp: + * TAO_IDL/be/be_visitor_array/array_cs.cpp: + * TAO_IDL/be/be_visitor_component/component_ch.cpp: + * TAO_IDL/be/be_visitor_component/component_ci.cpp: + * TAO_IDL/be/be_visitor_component/component_cs.cpp: + * TAO_IDL/be/be_visitor_component/component_sh.cpp: + * TAO_IDL/be/be_visitor_constant/constant_ch.cpp: + * TAO_IDL/be/be_visitor_constant/constant_cs.cpp: + * TAO_IDL/be/be_visitor_enum/cdr_op_cs.cpp: + * TAO_IDL/be/be_visitor_enum/enum_ch.cpp: + * TAO_IDL/be/be_visitor_enum/enum_cs.cpp: + * TAO_IDL/be/be_visitor_enum/serializer_op_cs.cpp: + * TAO_IDL/be/be_visitor_exception/any_op_cs.cpp: + * TAO_IDL/be/be_visitor_exception/exception_ch.cpp: + * TAO_IDL/be/be_visitor_exception/exception_ci.cpp: + * TAO_IDL/be/be_visitor_exception/exception_cs.cpp: + * TAO_IDL/be/be_visitor_home/home_ch.cpp: + * TAO_IDL/be/be_visitor_home/home_cs.cpp: + * TAO_IDL/be/be_visitor_interface/amh_ch.cpp: + * TAO_IDL/be/be_visitor_interface/amh_sh.cpp: + * TAO_IDL/be/be_visitor_interface/amh_si.cpp: + * TAO_IDL/be/be_visitor_interface/amh_ss.cpp: + * TAO_IDL/be/be_visitor_interface/base_proxy_broker_ch.cpp: + * TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp: + * TAO_IDL/be/be_visitor_interface/interface.cpp: + * TAO_IDL/be/be_visitor_interface/interface_ch.cpp: + * TAO_IDL/be/be_visitor_interface/interface_ci.cpp: + * TAO_IDL/be/be_visitor_interface/interface_cs.cpp: + * TAO_IDL/be/be_visitor_interface/interface_sh.cpp: + * TAO_IDL/be/be_visitor_interface/interface_ss.cpp: + * TAO_IDL/be/be_visitor_interface/remote_proxy_broker_ch.cpp: + * TAO_IDL/be/be_visitor_interface/remote_proxy_broker_cs.cpp: + * TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp: + * TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp: + * TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp: + * TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp: + * TAO_IDL/be/be_visitor_interface/tie_sh.cpp: + * TAO_IDL/be/be_visitor_interface/tie_si.cpp: + * TAO_IDL/be/be_visitor_interface_fwd/interface_fwd_ch.cpp: + * TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp: + * TAO_IDL/be/be_visitor_operation/amh_sh.cpp: + * TAO_IDL/be/be_visitor_operation/amh_ss.cpp: + * TAO_IDL/be/be_visitor_operation/ami_cs.cpp: + * TAO_IDL/be/be_visitor_operation/ami_exception_holder_operation_cs.cpp: + * TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_ch.cpp: + * TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp: + * TAO_IDL/be/be_visitor_operation/argument.cpp: + * TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp: + * TAO_IDL/be/be_visitor_operation/exceptlist_ss.cpp: + * TAO_IDL/be/be_visitor_operation/operation.cpp: + * TAO_IDL/be/be_visitor_operation/operation_sh.cpp: + * TAO_IDL/be/be_visitor_operation/operation_ss.cpp: + * TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp: + * TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp: + * TAO_IDL/be/be_visitor_root/root.cpp: + * TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp: + * TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp: + * TAO_IDL/be/be_visitor_structure/cdr_op_cs.cpp: + * TAO_IDL/be/be_visitor_structure/serializer_op_cs.cpp: + * TAO_IDL/be/be_visitor_structure/structure_ch.cpp: + * TAO_IDL/be/be_visitor_structure/structure_ci.cpp: + * TAO_IDL/be/be_visitor_structure/structure_cs.cpp: + * TAO_IDL/be/be_visitor_structure_fwd/structure_fwd_ch.cpp: + * TAO_IDL/be/be_visitor_typedef/typedef_ci.cpp: + * TAO_IDL/be/be_visitor_union/union_ch.cpp: + * TAO_IDL/be/be_visitor_union/union_ci.cpp: + * TAO_IDL/be/be_visitor_union/union_cs.cpp: + * TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp: + * TAO_IDL/be/be_visitor_union_branch/public_ci.cpp: + * TAO_IDL/be/be_visitor_union_fwd/union_fwd_ch.cpp: + * TAO_IDL/be/be_visitor_valuebox/cdr_op_cs.cpp: + * TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp: + * TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp: + * TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp: + * TAO_IDL/be/be_visitor_valuetype/arglist.cpp: + * TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp: + * TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ch.cpp: + * TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ci.cpp: + * TAO_IDL/be/be_visitor_valuetype_fwd/valuetype_fwd_ch.cpp: + * TAO_IDL/be_include/be_array.h: + * TAO_IDL/be_include/be_attribute.h: + * TAO_IDL/be_include/be_decl.h: + * TAO_IDL/be_include/be_enum.h: + * TAO_IDL/be_include/be_eventtype.h: + * TAO_IDL/be_include/be_exception.h: + * TAO_IDL/be_include/be_expression.h: + * TAO_IDL/be_include/be_generator.h: + * TAO_IDL/be_include/be_global.h: + * TAO_IDL/be_include/be_helper.h: + * TAO_IDL/be_include/be_interface.h: + * TAO_IDL/be_include/be_interface_fwd.h: + * TAO_IDL/be_include/be_operation.h: + * TAO_IDL/be_include/be_sequence.h: + * TAO_IDL/be_include/be_structure.h: + * TAO_IDL/be_include/be_type.h: + * TAO_IDL/be_include/be_typedef.h: + * TAO_IDL/be_include/be_union.h: + * TAO_IDL/be_include/be_valuetype.h: + * TAO_IDL/be_include/be_visitor_arg_traits.h: + * TAO_IDL/be_include/be_visitor_context.h: + * TAO_IDL/be_include/be_visitor_scope.h: + * TAO_IDL/be_include/be_visitor_operation/operation.h: + * TAO_IDL/be_include/be_visitor_valuetype/arglist.h: + * TAO_IDL/be_include/be_visitor_valuetype/field_ci.h: + * TAO_IDL/be_include/be_visitor_valuetype/field_cs.h: + * TAO_IDL/be_include/be_visitor_valuetype/valuetype.h: + * TAO_IDL/be_include/be_visitor_valuetype/valuetype_ci.h: + * TAO_IDL/driver/drv_args.cpp: + * TAO_IDL/driver/drv_preproc.cpp: + * TAO_IDL/fe/fe_init.cpp: + * TAO_IDL/fe/fe_interface_header.cpp: + * TAO_IDL/fe/idl.yy + * TAO_IDL/fe/lex.yy.cpp: + * TAO_IDL/fe/y.tab.cpp: + * TAO_IDL/fe/y.tab.cpp:.diff + * TAO_IDL/fe/y.tab.h: + * TAO_IDL/include/ast_array.h: + * TAO_IDL/include/ast_attribute.h: + * TAO_IDL/include/ast_component.h: + * TAO_IDL/include/ast_constant.h: + * TAO_IDL/include/ast_decl.h: + * TAO_IDL/include/ast_enum.h: + * TAO_IDL/include/ast_eventtype.h: + * TAO_IDL/include/ast_exception.h: + * TAO_IDL/include/ast_expression.h: + * TAO_IDL/include/ast_extern.h: + * TAO_IDL/include/ast_generator.h: + * TAO_IDL/include/ast_home.h: + * TAO_IDL/include/ast_interface.h: + * TAO_IDL/include/ast_interface_fwd.h: + * TAO_IDL/include/ast_module.h: + * TAO_IDL/include/ast_operation.h: + * TAO_IDL/include/ast_sequence.h: + * TAO_IDL/include/ast_structure.h: + * TAO_IDL/include/ast_structure_fwd.h: + * TAO_IDL/include/ast_type.h: + * TAO_IDL/include/ast_typedef.h: + * TAO_IDL/include/ast_union.h: + * TAO_IDL/include/ast_valuetype.h: + * TAO_IDL/include/fe_interface_header.h: + * TAO_IDL/include/global_extern.h: + * TAO_IDL/include/idl_global.h: + * TAO_IDL/include/utl_identifier.h: + * TAO_IDL/include/utl_list.h: + * TAO_IDL/include/utl_namelist.h: + * TAO_IDL/include/utl_scope.h: + * TAO_IDL/include/utl_string.h: + * TAO_IDL/include/utl_tmpl/utl_exceptlist.h: + * TAO_IDL/util/utl_global.cpp: + * TAO_IDL/util/utl_identifier.cpp: + * TAO_IDL/util/utl_idlist.cpp: + * TAO_IDL/util/utl_list.cpp: + * TAO_IDL/util/utl_namelist.cpp: + * TAO_IDL/util/utl_scope.cpp: + * TAO_IDL/util/utl_stack.cpp: + * TAO_IDL/util/utl_string.cpp: + * TAO_IDL/util/utl_strlist.cpp: + * TAO_IDL/util/utl_tmpl/utl_idlist.cpp: + * TAO_IDL/util/utl_tmpl/utl_list.cpp: + * TAO_IDL/util/utl_tmpl/utl_strlist.cpp: + + - Replaced all usage of the IDL compiler's internal type + idl_bool (typedef of long) with native bool. Also + replaced similarly typedef'd values I_TRUE and I_FALSE. + + - Extended the effects of the -Ge 2 command line option + (which previously replaced 'ACE_THROW' with 'throw' + and removed all generation of environment variables + and forms of 'ACE_CHECK' in user defined operations) + to remove generation of environment variables and + forms of 'ACE_CHECK' in all operations, including + overrides of inherited operations, to replace + all forms of 'ACE_TRY' and 'ACE_CATCH', and to + remove generation of 'ACE_ENDTRY'. + + - regenerated lex.yy.cpp and y.tab.cpp, along with + the associated diff files. + + - removed the passing of 'TAO_IDL_INCLUDE_DIR/tao' path to + the preprocessor, when 'TAO_IDL_INCLUDE_DIR' is used + instead of the TAO_ROOT environment variable. + + - made many cosmetic changes to generated code formatting. + Thu Feb 9 14:06:09 UTC 2006 Simon McQueen <sm@prismtech.com> * TAO_IDL/be/be_global.cpp: diff --git a/TAO/TAO_IDL/ast/ast_array.cpp b/TAO/TAO_IDL/ast/ast_array.cpp index cb42418defe..a34026cedee 100644 --- a/TAO/TAO_IDL/ast/ast_array.cpp +++ b/TAO/TAO_IDL/ast/ast_array.cpp @@ -78,8 +78,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "ace/Log_Msg.h" #include "ace/OS_Memory.h" -ACE_RCSID (ast, - ast_array, +ACE_RCSID (ast, + ast_array, "$Id$") // Constructor(s) and destructor. @@ -98,13 +98,13 @@ AST_Array::AST_Array (void) AST_Array::AST_Array (UTL_ScopedName *n, unsigned long nd, UTL_ExprList *ds, - 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, @@ -188,7 +188,7 @@ AST_Array::compute_size_type (void) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_array::compute_size_type - " - "bad base type\n"), + "bad base type\n"), -1); } diff --git a/TAO/TAO_IDL/ast/ast_attribute.cpp b/TAO/TAO_IDL/ast/ast_attribute.cpp index 7f19a28e6be..bbc7f6deec5 100644 --- a/TAO/TAO_IDL/ast/ast_attribute.cpp +++ b/TAO/TAO_IDL/ast/ast_attribute.cpp @@ -79,8 +79,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "utl_err.h" #include "global_extern.h" -ACE_RCSID (ast, - ast_attribute, +ACE_RCSID (ast, + ast_attribute, "$Id$") // Constructor(s) and destructor. @@ -88,17 +88,17 @@ AST_Attribute::AST_Attribute (void) : COMMON_Base (), AST_Decl (), AST_Field (), - pd_readonly (I_TRUE), + pd_readonly (true), pd_get_exceptions (0), pd_set_exceptions (0) { } -AST_Attribute::AST_Attribute (idl_bool ro, +AST_Attribute::AST_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, @@ -122,7 +122,7 @@ AST_Attribute::~AST_Attribute (void) void AST_Attribute::dump (ACE_OSTREAM_TYPE &o) { - this->dump_i (o, (this->pd_readonly == I_TRUE ? + this->dump_i (o, (this->pd_readonly == true ? "readonly attribute " : "attribute ")); AST_Field::dump (o); } @@ -167,7 +167,7 @@ AST_Attribute::be_add_set_exceptions (UTL_ExceptList *t) // Data accessors. -idl_bool +bool AST_Attribute::readonly (void) const { return this->pd_readonly; @@ -201,7 +201,7 @@ AST_Attribute::fe_add_get_exceptions (UTL_NameList *t) nl_n = nl_i.item (); d = this->defined_in ()->lookup_by_name (nl_n, - I_TRUE); + true); if (d == 0 || d->node_type() != AST_Decl::NT_except) { @@ -256,7 +256,7 @@ AST_Attribute::fe_add_set_exceptions (UTL_NameList *t) nl_n = nl_i.item (); d = this->defined_in ()->lookup_by_name (nl_n, - I_TRUE); + true); if (d == 0 || d->node_type() != AST_Decl::NT_except) { diff --git a/TAO/TAO_IDL/ast/ast_component.cpp b/TAO/TAO_IDL/ast/ast_component.cpp index b83509eff93..6c9e2054984 100644 --- a/TAO/TAO_IDL/ast/ast_component.cpp +++ b/TAO/TAO_IDL/ast/ast_component.cpp @@ -8,8 +8,8 @@ #include "utl_err.h" #include "global_extern.h" -ACE_RCSID (ast, - ast_component, +ACE_RCSID (ast, + ast_component, "$Id$") AST_Component::AST_Component (void) @@ -28,8 +28,8 @@ AST_Component::AST_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, @@ -40,8 +40,8 @@ AST_Component::AST_Component (UTL_ScopedName *n, n_supports, supports_flat, n_supports_flat, - I_FALSE, - I_FALSE), + false, + false), pd_base_component (base_component) { } @@ -75,22 +75,22 @@ AST_Component::redefine (AST_Interface *from) AST_Decl * AST_Component::look_in_inherited (UTL_ScopedName *e, - idl_bool treat_as_ref) + bool treat_as_ref) { AST_Decl *d = 0; - + if (this->pd_base_component != 0) { d = this->pd_base_component->lookup_by_name (e, treat_as_ref); } - + return d; } // Look through supported interface list. AST_Decl * AST_Component::look_in_supported (UTL_ScopedName *e, - idl_bool treat_as_ref) + bool treat_as_ref) { AST_Decl *d = 0; AST_Interface **is = 0; @@ -121,7 +121,7 @@ AST_Component::look_in_supported (UTL_ScopedName *e, break; } } - + return d; } @@ -137,7 +137,7 @@ AST_Component::supports (void) const return this->inherits (); } -long +long AST_Component::n_supports (void) const { return this->n_inherits (); @@ -223,7 +223,7 @@ AST_Component::ast_accept (ast_visitor *visitor) return visitor->visit_component (this); } -idl_bool +bool AST_Component::redef_clash (void) { if (this->AST_Interface::redef_clash ()) diff --git a/TAO/TAO_IDL/ast/ast_component_fwd.cpp b/TAO/TAO_IDL/ast/ast_component_fwd.cpp index ad7a9a93d56..3f4a10f8a93 100644 --- a/TAO/TAO_IDL/ast/ast_component_fwd.cpp +++ b/TAO/TAO_IDL/ast/ast_component_fwd.cpp @@ -4,8 +4,8 @@ #include "ast_visitor.h" #include "utl_identifier.h" -ACE_RCSID( ast, - ast_component_fwd, +ACE_RCSID( ast, + ast_component_fwd, "$Id$") AST_ComponentFwd::AST_ComponentFwd (void) @@ -18,8 +18,8 @@ AST_ComponentFwd::AST_ComponentFwd (void) AST_ComponentFwd::AST_ComponentFwd (AST_Interface *dummy, UTL_ScopedName *n) - : COMMON_Base (I_TRUE, - I_FALSE), + : COMMON_Base (true, + false), AST_Decl (AST_Decl::NT_component_fwd, n), AST_Type (AST_Decl::NT_component_fwd, diff --git a/TAO/TAO_IDL/ast/ast_constant.cpp b/TAO/TAO_IDL/ast/ast_constant.cpp index 9b82fd3fc8f..6a73e6d8e9a 100644 --- a/TAO/TAO_IDL/ast/ast_constant.cpp +++ b/TAO/TAO_IDL/ast/ast_constant.cpp @@ -77,8 +77,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "ast_generator.h" #include "nr_extern.h" -ACE_RCSID (ast, - ast_constant, +ACE_RCSID (ast, + ast_constant, "$Id$") // Static functions. @@ -140,27 +140,27 @@ AST_Constant::AST_Constant (void) // Used in constructing AST_EnumVal nodes. AST_Constant::AST_Constant (AST_Expression::ExprType t, - AST_Decl::NodeType nt, - AST_Expression *v, - UTL_ScopedName *n) + AST_Decl::NodeType nt, + AST_Expression *v, + UTL_ScopedName *n) : COMMON_Base (), AST_Decl (nt, n), - pd_constant_value (v), - pd_et (t), + pd_constant_value (v), + pd_et (t), ifr_added_ (0) { } // Used when constructing AST_Constant nodes. AST_Constant::AST_Constant (AST_Expression::ExprType t, - AST_Expression *v, - UTL_ScopedName *n) + AST_Expression *v, + UTL_ScopedName *n) : COMMON_Base (), AST_Decl (AST_Decl::NT_const, n), - pd_constant_value (v), - pd_et (t), + pd_constant_value (v), + pd_et (t), ifr_added_ (0) { // Avoids a truncation warning on MSVC when assigning a decimal @@ -171,7 +171,7 @@ AST_Constant::AST_Constant (AST_Expression::ExprType t, // of truncation would not apply. if (t == AST_Expression::EV_float && v->ev ()->et == AST_Expression::EV_double) { - AST_Expression::AST_ExprValue *ev = + AST_Expression::AST_ExprValue *ev = this->pd_constant_value->ev (); ev->et = t; ev->u.fval = (float) ev->u.dval; @@ -236,14 +236,14 @@ AST_Constant::et (void) return this->pd_et; } -idl_bool +bool AST_Constant::ifr_added (void) { return this->ifr_added_; } void -AST_Constant::ifr_added (idl_bool val) +AST_Constant::ifr_added (bool val) { this->ifr_added_ = val; } diff --git a/TAO/TAO_IDL/ast/ast_decl.cpp b/TAO/TAO_IDL/ast/ast_decl.cpp index f877e5ef2c9..71793021564 100644 --- a/TAO/TAO_IDL/ast/ast_decl.cpp +++ b/TAO/TAO_IDL/ast/ast_decl.cpp @@ -97,20 +97,20 @@ ACE_RCSID (ast, ast_decl, "$Id$") -COMMON_Base::COMMON_Base (idl_bool local, - idl_bool abstract) +COMMON_Base::COMMON_Base (bool local, + bool abstract) : is_local_ (local), is_abstract_ (abstract) { } -idl_bool +bool COMMON_Base::is_local (void) { return this->is_local_; } -idl_bool +bool COMMON_Base::is_abstract (void) { return this->is_abstract_; @@ -128,20 +128,20 @@ AST_Decl::AST_Decl (void) repoID_ (0), flat_name_ (0), contains_wstring_ (-1), - pd_imported (I_FALSE), - pd_in_main_file (I_FALSE), + pd_imported (false), + pd_in_main_file (false), pd_defined_in (0), pd_node_type (NT_module), pd_line (-1), pd_file_name (0), pd_local_name (0), pd_original_local_name (0), - pd_added (I_FALSE), + pd_added (false), full_name_ (0), prefix_ (0), version_ (0), - anonymous_ (I_FALSE), - typeid_set_ (I_FALSE), + anonymous_ (false), + typeid_set_ (false), last_referenced_as_ (0), prefix_scope_ (0) { @@ -149,7 +149,7 @@ AST_Decl::AST_Decl (void) AST_Decl::AST_Decl (NodeType nt, UTL_ScopedName *n, - idl_bool anonymous) + bool anonymous) : COMMON_Base (), repoID_ (0), flat_name_ (0), @@ -165,12 +165,12 @@ AST_Decl::AST_Decl (NodeType nt, pd_name (0), pd_local_name (n == 0 ? 0 : n->last_component ()->copy ()), pd_original_local_name (0), - pd_added (I_FALSE), + pd_added (false), full_name_ (0), prefix_ (0), version_ (0), anonymous_ (anonymous), - typeid_set_ (I_FALSE), + typeid_set_ (false), last_referenced_as_ (0), prefix_scope_ (0) { @@ -275,7 +275,7 @@ AST_Decl::set_prefix_with_typeprefix_r (const char *value, { AST_Decl *decl = ScopeAsDecl (this->prefix_scope_); - idl_bool overridden = + bool overridden = decl->has_ancestor (ScopeAsDecl (appeared_in)); if (overridden) @@ -351,8 +351,8 @@ AST_Decl::compute_full_name (void) else { size_t namelen = 0; - long first = I_TRUE; - long second = I_FALSE; + long first = true; + long second = false; char *name = 0; for (UTL_IdListActiveIterator i (this->name ()); @@ -365,7 +365,7 @@ AST_Decl::compute_full_name (void) } else if (second) { - first = second = I_FALSE; + first = second = false; } // Print the identifier. @@ -377,11 +377,11 @@ AST_Decl::compute_full_name (void) if (ACE_OS::strcmp (name, "") != 0) { // Does not start with a "". - first = I_FALSE; + first = false; } else { - second = I_TRUE; + second = true; } } } @@ -390,8 +390,8 @@ AST_Decl::compute_full_name (void) char[namelen + 1]); this->full_name_[0] = '\0'; - first = I_TRUE; - second = I_FALSE; + first = true; + second = false; for (UTL_IdListActiveIterator j (this->name ()); !j.is_done (); @@ -403,7 +403,7 @@ AST_Decl::compute_full_name (void) } else if (second) { - first = second = I_FALSE; + first = second = false; } // Print the identifier. @@ -415,11 +415,11 @@ AST_Decl::compute_full_name (void) if (ACE_OS::strcmp (name, "") != 0) { // Does not start with a "". - first = I_FALSE; + first = false; } else { - second = I_TRUE; + second = true; } } } @@ -436,8 +436,8 @@ AST_Decl::compute_repoID (void) } size_t namelen = 4; // for the prefix "IDL:" - long first = I_TRUE; - long second = I_FALSE; + long first = true; + long second = false; char *name = 0; const char *prefix = (this->prefix_ ? this->prefix_ : ""); UTL_Scope *scope = this->defined_in (); @@ -494,7 +494,7 @@ AST_Decl::compute_repoID (void) } else if (second) { - first = second = I_FALSE; + first = second = false; } // Print the identifier. @@ -515,11 +515,11 @@ AST_Decl::compute_repoID (void) if (ACE_OS::strcmp (name, "") != 0) { // Does not start with a "". - first = I_FALSE; + first = false; } else { - second = I_TRUE; + second = true; } } } @@ -541,8 +541,8 @@ AST_Decl::compute_repoID (void) ACE_OS::strcat (this->repoID_, "/"); } - first = I_TRUE; - second = I_FALSE; + first = true; + second = false; for (UTL_IdListActiveIterator j (this->name ()); !j.is_done (); @@ -554,7 +554,7 @@ AST_Decl::compute_repoID (void) } else if (second) { - first = second = I_FALSE; + first = second = false; } // Print the identifier. @@ -576,11 +576,11 @@ AST_Decl::compute_repoID (void) if (ACE_OS::strcmp (name, "") != 0) { // Does not start with a "". - first = I_FALSE; + first = false; } else { - second = I_TRUE; + second = true; } } } @@ -623,8 +623,8 @@ AST_Decl::compute_flat_name (void) else { size_t namelen = 0; - 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. @@ -638,7 +638,7 @@ AST_Decl::compute_flat_name (void) } else if (second) { - first = second = I_FALSE; + first = second = false; } // Print the identifier. @@ -650,11 +650,11 @@ AST_Decl::compute_flat_name (void) if (ACE_OS::strcmp (item_name, "") != 0) { // Does not start with a "". - first = I_FALSE; + first = false; } else { - second = I_TRUE; + second = true; } } } @@ -663,8 +663,8 @@ AST_Decl::compute_flat_name (void) char[namelen + 1]); this->flat_name_[0] = '\0'; - first = I_TRUE; - second = I_FALSE; + first = true; + second = false; for (UTL_IdListActiveIterator j (this->name ()); !j.is_done (); @@ -676,7 +676,7 @@ AST_Decl::compute_flat_name (void) } else if (second) { - first = second = I_FALSE; + first = second = false; } // Print the identifier. @@ -688,11 +688,11 @@ AST_Decl::compute_flat_name (void) if (ACE_OS::strcmp (item_name, "") != 0) { // Does not start with a "". - first = I_FALSE; + first = false; } else { - second = I_TRUE; + second = true; } } } @@ -701,12 +701,12 @@ AST_Decl::compute_flat_name (void) // Return TRUE if one of my ancestor scopes is "s" // and FALSE otherwise. -idl_bool +bool AST_Decl::has_ancestor (AST_Decl *s) { if (this == s) { - return I_TRUE; + return true; } if (s->node_type () == AST_Decl::NT_module) @@ -718,7 +718,7 @@ AST_Decl::has_ancestor (AST_Decl *s) { if (this == other_opening) { - return I_TRUE; + return true; } other_opening = enclosing->lookup_by_name_local (s->local_name (), @@ -728,13 +728,13 @@ AST_Decl::has_ancestor (AST_Decl *s) if (this->pd_defined_in == 0) { - return I_FALSE; + return false; } return ScopeAsDecl (this->pd_defined_in)->has_ancestor (s); } -idl_bool +bool AST_Decl::is_child (AST_Decl *s) { if (this->defined_in ()) @@ -755,7 +755,7 @@ AST_Decl::is_child (AST_Decl *s) return 0; // Not a child. } -idl_bool +bool AST_Decl::is_nested (void) { AST_Decl *d = ScopeAsDecl (this->defined_in ()); @@ -764,10 +764,10 @@ AST_Decl::is_nested (void) // then we are defined at some nesting level. if (d != 0 && d->node_type () != AST_Decl::NT_root) { - return I_TRUE; + return true; } - return I_FALSE; + return false; } // Dump this AST_Decl to the ostream o. @@ -955,26 +955,26 @@ AST_Decl::version (char *value) } } -idl_bool +bool AST_Decl::anonymous (void) const { return this->anonymous_; } void -AST_Decl::anonymous (idl_bool val) +AST_Decl::anonymous (bool val) { this->anonymous_ = val; } -idl_bool +bool AST_Decl::typeid_set (void) const { return this->typeid_set_; } void -AST_Decl::typeid_set (idl_bool val) +AST_Decl::typeid_set (bool val) { this->typeid_set_ = val; } @@ -1030,7 +1030,7 @@ AST_Decl::set_id_with_typeid (char *value) delete [] this->repoID_; this->repoID_ = 0; this->repoID (value); - this->typeid_set_ = I_TRUE; + this->typeid_set_ = true; } void @@ -1059,38 +1059,38 @@ AST_Decl::set_prefix_with_typeprefix (const char *value) DeclAsScope (this)); } -idl_bool +bool AST_Decl::imported (void) { return this->pd_imported; } void -AST_Decl::set_imported (idl_bool is_it) +AST_Decl::set_imported (bool is_it) { this->pd_imported = is_it; } -idl_bool +bool AST_Decl::in_main_file (void) { return this->pd_in_main_file; } void -AST_Decl::set_in_main_file (idl_bool is_it) +AST_Decl::set_in_main_file (bool is_it) { this->pd_in_main_file = is_it; } -idl_bool +bool AST_Decl::added (void) { return this->pd_added; } void -AST_Decl::set_added (idl_bool is_it) +AST_Decl::set_added (bool is_it) { this->pd_added = is_it; } diff --git a/TAO/TAO_IDL/ast/ast_enum.cpp b/TAO/TAO_IDL/ast/ast_enum.cpp index 23bde0b68b7..cb18dc00c99 100644 --- a/TAO/TAO_IDL/ast/ast_enum.cpp +++ b/TAO/TAO_IDL/ast/ast_enum.cpp @@ -72,8 +72,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "utl_err.h" #include "utl_indenter.h" -ACE_RCSID (ast, - ast_enum, +ACE_RCSID (ast, + ast_enum, "$Id$") AST_Enum::AST_Enum (void) @@ -82,24 +82,24 @@ AST_Enum::AST_Enum (void) AST_Type (), AST_ConcreteType (), UTL_Scope (), - pd_enum_counter (0), + pd_enum_counter (0), member_count_ (-1) { this->size_type (AST_Type::FIXED); } AST_Enum::AST_Enum (UTL_ScopedName *n, - idl_bool local, - idl_bool abstract) + bool local, + bool abstract) : COMMON_Base (local, abstract), AST_Decl (AST_Decl::NT_enum, n), - AST_Type (AST_Decl::NT_enum, + AST_Type (AST_Decl::NT_enum, n), - AST_ConcreteType (AST_Decl::NT_enum, + AST_ConcreteType (AST_Decl::NT_enum, n), - UTL_Scope (AST_Decl::NT_enum), + UTL_Scope (AST_Decl::NT_enum), pd_enum_counter (0), member_count_ (-1) { @@ -150,7 +150,7 @@ AST_Enum::lookup_by_value (const AST_Expression *v) AST_EnumVal *item = 0; AST_Decl *d = 0; - for (UTL_ScopeActiveIterator i (this, IK_decls); + for (UTL_ScopeActiveIterator i (this, IK_decls); !i.is_done (); i.next ()) { @@ -220,8 +220,8 @@ AST_Enum::compute_member_count (void) // If there are elements in this scope if (this->nmembers () > 0) { - for (UTL_ScopeActiveIterator i (this, IK_decls); - !i.is_done (); + for (UTL_ScopeActiveIterator i (this, IK_decls); + !i.is_done (); i.next ()) { // Get the next AST decl node. @@ -247,7 +247,7 @@ AST_Enum::fe_add_enum_val (AST_EnumVal *t) t1 = idl_global->gen ()->create_enum_val (tmp, t->name ()); - UTL_ScopedName *sn = + UTL_ScopedName *sn = munge_name_for_enumval ((UTL_IdList *) t->name ()->copy (), t->local_name ()); @@ -260,7 +260,7 @@ AST_Enum::fe_add_enum_val (AST_EnumVal *t) } // Already defined and cannot be redefined? Or already used? - if ((d = this->lookup_for_add (t, I_FALSE)) != 0) + if ((d = this->lookup_for_add (t, false)) != 0) { if (!can_be_redefined (d)) { @@ -293,7 +293,7 @@ AST_Enum::fe_add_enum_val (AST_EnumVal *t) // Add it to set of locally referenced symbols. this->add_to_referenced (t, - I_FALSE, + false, t->local_name ()); // Add it to enclosing scope. diff --git a/TAO/TAO_IDL/ast/ast_eventtype.cpp b/TAO/TAO_IDL/ast/ast_eventtype.cpp index 41b5d656a06..7338bf6ef3d 100644 --- a/TAO/TAO_IDL/ast/ast_eventtype.cpp +++ b/TAO/TAO_IDL/ast/ast_eventtype.cpp @@ -7,8 +7,8 @@ #include "utl_indenter.h" #include "global_extern.h" -ACE_RCSID (ast, - ast_eventtype, +ACE_RCSID (ast, + ast_eventtype, "$Id$") AST_EventType::AST_EventType (void) @@ -30,10 +30,10 @@ AST_EventType::AST_EventType (UTL_ScopedName *n, AST_Interface **supports, long n_supports, AST_Interface *supports_concrete, - idl_bool abstract, - idl_bool truncatable, - idl_bool custom) - : COMMON_Base (I_FALSE, + bool abstract, + bool truncatable, + bool custom) + : COMMON_Base (false, abstract), AST_Decl (AST_Decl::NT_eventtype, n), @@ -45,7 +45,7 @@ AST_EventType::AST_EventType (UTL_ScopedName *n, n_inherits, inherits_flat, n_inherits_flat, - I_FALSE, + false, abstract), AST_ValueType (n, inherits, diff --git a/TAO/TAO_IDL/ast/ast_eventtype_fwd.cpp b/TAO/TAO_IDL/ast/ast_eventtype_fwd.cpp index 8699d274f9f..6bff9695525 100644 --- a/TAO/TAO_IDL/ast/ast_eventtype_fwd.cpp +++ b/TAO/TAO_IDL/ast/ast_eventtype_fwd.cpp @@ -5,8 +5,8 @@ #include "ast_visitor.h" #include "utl_identifier.h" -ACE_RCSID( ast, - ast_eventtype_fwd, +ACE_RCSID( ast, + ast_eventtype_fwd, "$Id$") AST_EventTypeFwd::AST_EventTypeFwd (void) @@ -20,7 +20,7 @@ AST_EventTypeFwd::AST_EventTypeFwd (void) AST_EventTypeFwd::AST_EventTypeFwd (AST_Interface *dummy, UTL_ScopedName *n) - : COMMON_Base (I_FALSE, + : COMMON_Base (false, dummy->is_abstract ()), AST_Decl (AST_Decl::NT_eventtype_fwd, n), diff --git a/TAO/TAO_IDL/ast/ast_exception.cpp b/TAO/TAO_IDL/ast/ast_exception.cpp index e0cc7761758..62a91cd53e4 100644 --- a/TAO/TAO_IDL/ast/ast_exception.cpp +++ b/TAO/TAO_IDL/ast/ast_exception.cpp @@ -78,8 +78,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "utl_identifier.h" #include "utl_indenter.h" -ACE_RCSID (ast, - ast_exception, +ACE_RCSID (ast, + ast_exception, "$Id$") AST_Exception::AST_Exception (void) @@ -93,8 +93,8 @@ AST_Exception::AST_Exception (void) } AST_Exception::AST_Exception (UTL_ScopedName *n, - idl_bool local, - idl_bool abstract) + bool local, + bool abstract) : COMMON_Base (local, abstract), AST_Decl (AST_Decl::NT_except, @@ -118,14 +118,14 @@ AST_Exception::~AST_Exception (void) // Public operations. // Are we or the parameter node involved in any recursion? -idl_bool +bool AST_Exception::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list) { // Proceed if the number of members in our scope is greater than 0. if (this->nmembers () > 0) { list.enqueue_tail (this); - + // Continue until each element is visited. for (UTL_ScopeActiveIterator i (this, IK_decls);!i.is_done ();i.next ()) { @@ -178,7 +178,7 @@ AST_Exception::fe_add_field (AST_Field *t) AST_Decl *d = 0; // Already defined and cannot be redefined? Or already used? - if ((d = this->lookup_for_add (t, I_FALSE)) != 0) + if ((d = this->lookup_for_add (t, false)) != 0) { if (!can_be_redefined (d)) { @@ -211,7 +211,7 @@ AST_Exception::fe_add_field (AST_Field *t) // Add it to set of locally referenced symbols. this->add_to_referenced (t, - I_FALSE, + false, t->local_name ()); AST_Type *ft = t->field_type (); @@ -220,7 +220,7 @@ AST_Exception::fe_add_field (AST_Field *t) if (mru != 0) { this->add_to_referenced (ft, - I_FALSE, + false, mru->first_component ()); } @@ -236,7 +236,7 @@ AST_Exception::fe_add_union (AST_Union *t) AST_Decl *d = 0; // Already defined and cannot be redefined? Or already used? - if ((d = this->lookup_for_add (t, I_FALSE)) != 0) + if ((d = this->lookup_for_add (t, false)) != 0) { if (!can_be_redefined (d)) { @@ -269,7 +269,7 @@ AST_Exception::fe_add_union (AST_Union *t) // Add it to set of locally referenced symbols. this->add_to_referenced (t, - I_FALSE, + false, t->local_name ()); return t; @@ -283,7 +283,7 @@ AST_Exception::fe_add_structure (AST_Structure *t) AST_Decl *d = 0; // Already defined and cannot be redefined? Or already used? - if ((d = this->lookup_for_add (t, I_FALSE)) != 0) + if ((d = this->lookup_for_add (t, false)) != 0) { if (!can_be_redefined (d)) { @@ -315,7 +315,7 @@ AST_Exception::fe_add_structure (AST_Structure *t) // Add it to set of locally referenced symbols. this->add_to_referenced (t, - I_FALSE, + false, t->local_name ()); return t; @@ -328,7 +328,7 @@ AST_Exception::fe_add_enum (AST_Enum *t) AST_Decl *d = 0; // Already defined and cannot be redefined? Or already used? - if ((d = this->lookup_for_add (t, I_FALSE)) != 0) + if ((d = this->lookup_for_add (t, false)) != 0) { if (!can_be_redefined (d)) { @@ -361,7 +361,7 @@ AST_Exception::fe_add_enum (AST_Enum *t) // Add it to set of locally referenced symbols. this->add_to_referenced (t, - I_FALSE, + false, t->local_name ()); return t; @@ -377,7 +377,7 @@ AST_Exception::fe_add_enum_val (AST_EnumVal *t) AST_Decl *d = 0; // Already defined and cannot be redefined? Or already used? - if ((d = this->lookup_for_add (t, I_FALSE)) != 0) + if ((d = this->lookup_for_add (t, false)) != 0) { if (!can_be_redefined (d)) { @@ -410,7 +410,7 @@ AST_Exception::fe_add_enum_val (AST_EnumVal *t) // Add it to set of locally referenced symbols. this->add_to_referenced (t, - I_FALSE, + false, t->local_name ()); return t; diff --git a/TAO/TAO_IDL/ast/ast_expression.cpp b/TAO/TAO_IDL/ast/ast_expression.cpp index 95af525b6e5..285f4cfca7f 100644 --- a/TAO/TAO_IDL/ast/ast_expression.cpp +++ b/TAO/TAO_IDL/ast/ast_expression.cpp @@ -198,9 +198,8 @@ AST_Expression::AST_Expression (long lv) this->pd_ev->u.lval = lv; } -// An AST_Expression denoting a long integer being used as a boolean. -AST_Expression::AST_Expression (long lv, - ExprType t) +// An AST_Expression denoting a boolean. +AST_Expression::AST_Expression (bool b) : pd_ec (EC_none), pd_ev (0), pd_v1 (0), @@ -213,9 +212,8 @@ AST_Expression::AST_Expression (long lv, ACE_NEW (this->pd_ev, AST_ExprValue); - this->pd_ev->et = EV_long; - this->pd_ev->et = t; - this->pd_ev->u.lval = lv; + this->pd_ev->et = EV_bool; + this->pd_ev->u.bval = b; } // An AST_Expression denoting an unsigned long integer. @@ -1029,24 +1027,24 @@ coerce_value (AST_Expression::AST_ExprValue *ev, switch (ev->et) { case AST_Expression::EV_short: - ev->u.bval = (ev->u.sval == 0) ? I_FALSE : I_TRUE; + ev->u.bval = (ev->u.sval == 0) ? false : true; ev->et = AST_Expression::EV_bool; return ev; case AST_Expression::EV_ushort: - ev->u.bval = (ev->u.usval == 0) ? I_FALSE : I_TRUE; + ev->u.bval = (ev->u.usval == 0) ? false : true; ev->et = AST_Expression::EV_bool; return ev; case AST_Expression::EV_long: - ev->u.bval = (ev->u.lval == 0) ? I_FALSE : I_TRUE; + ev->u.bval = (ev->u.lval == 0) ? false : true; ev->et = AST_Expression::EV_bool; return ev; case AST_Expression::EV_ulong: - ev->u.bval = (ev->u.ulval == 0) ? I_FALSE : I_TRUE; + ev->u.bval = (ev->u.ulval == 0) ? false : true; ev->et = AST_Expression::EV_bool; return ev; case AST_Expression::EV_longlong: #if ! defined (ACE_LACKS_LONGLONG_T) - ev->u.bval = (ev->u.llval == 0) ? I_FALSE : I_TRUE; + ev->u.bval = (ev->u.llval == 0) ? false : true; ev->et = AST_Expression::EV_bool; return ev; #else /* ! defined (ACE_LACKS_LONGLONG_T) */ @@ -1054,7 +1052,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev, #endif /* ! defined (ACE_LACKS_LONGLONG_T) */ case AST_Expression::EV_ulonglong: #if ! defined (ACE_LACKS_LONGLONG_T) - ev->u.bval = (ev->u.ullval == 0) ? I_FALSE : I_TRUE; + ev->u.bval = (ev->u.ullval == 0) ? false : true; ev->et = AST_Expression::EV_bool; return ev; #else /* ! defined (ACE_LACKS_LONGLONG_T) */ @@ -1063,23 +1061,23 @@ coerce_value (AST_Expression::AST_ExprValue *ev, case AST_Expression::EV_bool: return ev; case AST_Expression::EV_float: - ev->u.bval = (ev->u.fval == 0.0) ? I_FALSE : I_TRUE; + ev->u.bval = (ev->u.fval == 0.0) ? false : true; ev->et = AST_Expression::EV_bool; return ev; case AST_Expression::EV_double: - ev->u.bval = (ev->u.dval == 0.0) ? I_FALSE : I_TRUE; + ev->u.bval = (ev->u.dval == 0.0) ? false : true; ev->et = AST_Expression::EV_bool; return ev; case AST_Expression::EV_char: - ev->u.bval = (ev->u.cval == 0) ? I_FALSE : I_TRUE; + ev->u.bval = (ev->u.cval == 0) ? false : true; ev->et = AST_Expression::EV_bool; return ev; case AST_Expression::EV_wchar: - ev->u.bval = (ev->u.wcval == 0) ? I_FALSE : I_TRUE; + ev->u.bval = (ev->u.wcval == 0) ? false : true; ev->et = AST_Expression::EV_bool; return ev; case AST_Expression::EV_octet: - ev->u.bval = (ev->u.oval == 0) ? I_FALSE : I_TRUE; + ev->u.bval = (ev->u.oval == 0) ? false : true; ev->et = AST_Expression::EV_bool; return ev; case AST_Expression::EV_longdouble: @@ -1133,7 +1131,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev, return 0; #endif /* ! defined (ACE_LACKS_LONGLONG_T) */ case AST_Expression::EV_bool: - ev->u.fval = (float) ((ev->u.bval == I_TRUE) ? 1.0 : 0.0); + ev->u.fval = (float) ((ev->u.bval == true) ? 1.0 : 0.0); ev->et = AST_Expression::EV_float; return ev; case AST_Expression::EV_float: @@ -1213,7 +1211,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev, return NULL; #endif /* ! defined (ACE_LACKS_LONGLONG_T) */ case AST_Expression::EV_bool: - ev->u.dval = (ev->u.bval == I_TRUE) ? 1.0 : 0.0; + ev->u.dval = (ev->u.bval == true) ? 1.0 : 0.0; ev->et = AST_Expression::EV_double; return ev; case AST_Expression::EV_float: @@ -1546,7 +1544,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev, return 0; #endif /* ! defined (ACE_LACKS_LONGLONG_T) */ case AST_Expression::EV_bool: - ev->u.oval = (unsigned char) ((ev->u.bval == I_FALSE) ? 1 : 0); + ev->u.oval = (unsigned char) ((ev->u.bval == false) ? 1 : 0); ev->et = AST_Expression::EV_octet; return ev; case AST_Expression::EV_float: @@ -1638,7 +1636,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev, // Integer literals may not be assigned to floating point constants, // and vice versa. -static idl_bool +static bool incompatible_types (AST_Expression::ExprType t1, AST_Expression::ExprType t2) { @@ -1775,64 +1773,64 @@ AST_Expression::eval_bin_op (AST_Expression::EvalKind ek) retval->et = EV_ulonglong; switch (this->pd_ec) - { - case EC_add: - retval->u.ullval = - this->pd_v1->ev ()->u.ullval + this->pd_v2->ev ()->u.ullval; - break; - case EC_minus: - retval->u.ullval = - this->pd_v1->ev ()->u.ullval - this->pd_v2->ev ()->u.ullval; - break; - case EC_mul: - retval->u.ullval = - this->pd_v1->ev ()->u.ullval * this->pd_v2->ev ()->u.ullval; - break; - case EC_div: - if (this->pd_v2->ev ()->u.ullval == 0) - { - return 0; - } - - retval->u.ullval = - this->pd_v1->ev ()->u.ullval / this->pd_v2->ev ()->u.ullval; - break; - default: - return 0; - } + { + case EC_add: + retval->u.ullval = + this->pd_v1->ev ()->u.ullval + this->pd_v2->ev ()->u.ullval; + break; + case EC_minus: + retval->u.ullval = + this->pd_v1->ev ()->u.ullval - this->pd_v2->ev ()->u.ullval; + break; + case EC_mul: + retval->u.ullval = + this->pd_v1->ev ()->u.ullval * this->pd_v2->ev ()->u.ullval; + break; + case EC_div: + if (this->pd_v2->ev ()->u.ullval == 0) + { + return 0; + } + + retval->u.ullval = + this->pd_v1->ev ()->u.ullval / this->pd_v2->ev ()->u.ullval; + break; + default: + return 0; + } } else if (ek == EK_longlong) { this->pd_v1->set_ev (this->pd_v1->coerce (EV_longlong)); this->pd_v2->set_ev (this->pd_v2->coerce (EV_longlong)); retval->et = EV_longlong; - + switch (this->pd_ec) - { - case EC_add: - retval->u.llval = - this->pd_v1->ev ()->u.llval + this->pd_v2->ev ()->u.llval; - break; - case EC_minus: - retval->u.llval = - this->pd_v1->ev ()->u.llval - this->pd_v2->ev ()->u.llval; - break; - case EC_mul: - retval->u.llval = - this->pd_v1->ev ()->u.llval * this->pd_v2->ev ()->u.llval; - break; - case EC_div: - if (this->pd_v2->ev ()->u.llval == 0) - { - return 0; - } - - retval->u.llval = - this->pd_v1->ev ()->u.llval / this->pd_v2->ev ()->u.llval; - break; - default: - return 0; - } + { + case EC_add: + retval->u.llval = + this->pd_v1->ev ()->u.llval + this->pd_v2->ev ()->u.llval; + break; + case EC_minus: + retval->u.llval = + this->pd_v1->ev ()->u.llval - this->pd_v2->ev ()->u.llval; + break; + case EC_mul: + retval->u.llval = + this->pd_v1->ev ()->u.llval * this->pd_v2->ev ()->u.llval; + break; + case EC_div: + if (this->pd_v2->ev ()->u.llval == 0) + { + return 0; + } + + retval->u.llval = + this->pd_v1->ev ()->u.llval / this->pd_v2->ev ()->u.llval; + break; + default: + return 0; + } } else #endif @@ -1840,35 +1838,35 @@ AST_Expression::eval_bin_op (AST_Expression::EvalKind ek) this->pd_v1->set_ev (this->pd_v1->coerce (EV_double)); this->pd_v2->set_ev (this->pd_v2->coerce (EV_double)); retval->et = EV_double; - + switch (this->pd_ec) - { - case EC_add: - retval->u.dval = - this->pd_v1->ev ()->u.dval + this->pd_v2->ev ()->u.dval; - break; - case EC_minus: - retval->u.dval = - this->pd_v1->ev ()->u.dval - this->pd_v2->ev ()->u.dval; - break; - case EC_mul: - retval->u.dval = - this->pd_v1->ev ()->u.dval * this->pd_v2->ev ()->u.dval; - break; - case EC_div: - if (this->pd_v2->ev ()->u.dval == 0.0) - { - return 0; - } - - retval->u.dval = - this->pd_v1->ev ()->u.dval / this->pd_v2->ev ()->u.dval; - break; - default: - return 0; - } + { + case EC_add: + retval->u.dval = + this->pd_v1->ev ()->u.dval + this->pd_v2->ev ()->u.dval; + break; + case EC_minus: + retval->u.dval = + this->pd_v1->ev ()->u.dval - this->pd_v2->ev ()->u.dval; + break; + case EC_mul: + retval->u.dval = + this->pd_v1->ev ()->u.dval * this->pd_v2->ev ()->u.dval; + break; + case EC_div: + if (this->pd_v2->ev ()->u.dval == 0.0) + { + return 0; + } + + retval->u.dval = + this->pd_v1->ev ()->u.dval / this->pd_v2->ev ()->u.dval; + break; + default: + return 0; + } } - + return retval; } // Apply binary operators to an AST_Expression after evaluating @@ -1904,12 +1902,12 @@ AST_Expression::eval_mod_op (AST_Expression::EvalKind ek) retval->et = EV_ulonglong; if (this->pd_v2->ev ()->u.ullval == 0) - { - return 0; - } + { + return 0; + } retval->u.ullval = - this->pd_v1->ev ()->u.ullval % this->pd_v2->ev ()->u.ullval; + this->pd_v1->ev ()->u.ullval % this->pd_v2->ev ()->u.ullval; } else if (ek == EK_longlong) { @@ -1918,12 +1916,12 @@ AST_Expression::eval_mod_op (AST_Expression::EvalKind ek) retval->et = EV_longlong; if (this->pd_v2->ev ()->u.llval == 0) - { - return 0; - } + { + return 0; + } retval->u.llval = - this->pd_v1->ev ()->u.llval % this->pd_v2->ev ()->u.llval; + this->pd_v1->ev ()->u.llval % this->pd_v2->ev ()->u.llval; } else #endif @@ -1934,12 +1932,12 @@ AST_Expression::eval_mod_op (AST_Expression::EvalKind ek) retval->et = EV_ulong; if (this->pd_v2->ev ()->u.ulval == 0) - { - return 0; - } + { + return 0; + } retval->u.ulval = - this->pd_v1->ev ()->u.ulval % this->pd_v2->ev ()->u.ulval; + this->pd_v1->ev ()->u.ulval % this->pd_v2->ev ()->u.ulval; } else if (ek == EK_long) { @@ -1948,18 +1946,18 @@ AST_Expression::eval_mod_op (AST_Expression::EvalKind ek) retval->et = EV_long; if (this->pd_v2->ev ()->u.lval == 0) - { - return 0; - } + { + return 0; + } retval->u.lval = - this->pd_v1->ev ()->u.lval % this->pd_v2->ev ()->u.lval; + this->pd_v1->ev ()->u.lval % this->pd_v2->ev ()->u.lval; } else { return 0; } - + return retval; } @@ -1994,9 +1992,9 @@ AST_Expression::eval_bit_op (AST_Expression::EvalKind ek) this->pd_v1->set_ev (this->pd_v1->coerce (EV_ulonglong)); this->pd_v2->set_ev (this->pd_v2->coerce (EV_ulonglong)); retval->et = EV_ulonglong; - + switch (this->pd_ec) - { + { case EC_or: retval->u.ullval = this->pd_v1->ev ()->u.ullval | this->pd_v2->ev ()->u.ullval; @@ -2019,16 +2017,16 @@ AST_Expression::eval_bit_op (AST_Expression::EvalKind ek) break; default: return 0; - } + } } else if (ek == EK_longlong) { this->pd_v1->set_ev (this->pd_v1->coerce (EV_longlong)); this->pd_v2->set_ev (this->pd_v2->coerce (EV_longlong)); retval->et = EV_longlong; - + switch (this->pd_ec) - { + { case EC_or: retval->u.llval = this->pd_v1->ev ()->u.llval | this->pd_v2->ev ()->u.llval; @@ -2051,7 +2049,7 @@ AST_Expression::eval_bit_op (AST_Expression::EvalKind ek) break; default: return 0; - } + } } else #endif @@ -2060,9 +2058,9 @@ AST_Expression::eval_bit_op (AST_Expression::EvalKind ek) this->pd_v1->set_ev (this->pd_v1->coerce (EV_ulong)); this->pd_v2->set_ev (this->pd_v2->coerce (EV_ulong)); retval->et = EV_ulong; - + switch (this->pd_ec) - { + { case EC_or: retval->u.ulval = this->pd_v1->ev ()->u.ulval | this->pd_v2->ev ()->u.ulval; @@ -2085,16 +2083,16 @@ AST_Expression::eval_bit_op (AST_Expression::EvalKind ek) break; default: return 0; - } + } } else if (ek == EK_long) { this->pd_v1->set_ev (this->pd_v1->coerce (EV_long)); this->pd_v2->set_ev (this->pd_v2->coerce (EV_long)); retval->et = EV_long; - + switch (this->pd_ec) - { + { case EC_or: retval->u.lval = this->pd_v1->ev ()->u.lval | this->pd_v2->ev ()->u.lval; @@ -2117,16 +2115,16 @@ AST_Expression::eval_bit_op (AST_Expression::EvalKind ek) break; default: return 0; - } + } } else if (ek == EK_bool) { this->pd_v1->set_ev (this->pd_v1->coerce (EV_bool)); this->pd_v2->set_ev (this->pd_v2->coerce (EV_bool)); retval->et = EV_bool; - + switch (this->pd_ec) - { + { case EC_or: retval->u.bval = this->pd_v1->ev ()->u.bval | this->pd_v2->ev ()->u.bval; @@ -2141,21 +2139,21 @@ AST_Expression::eval_bit_op (AST_Expression::EvalKind ek) break; case EC_left: retval->u.bval = - this->pd_v1->ev ()->u.bval << this->pd_v2->ev ()->u.bval; + this->pd_v1->ev ()->u.ulval << this->pd_v2->ev ()->u.ulval; break; case EC_right: retval->u.bval = - this->pd_v1->ev ()->u.bval >> this->pd_v2->ev ()->u.bval; + this->pd_v1->ev ()->u.ulval >> this->pd_v2->ev ()->u.ulval; break; default: return 0; - } + } } else { return 0; } - + return retval; } @@ -2292,7 +2290,7 @@ AST_Expression::eval_symbol (AST_Expression::EvalKind ek) // Do lookup. d = s->lookup_by_name (this->pd_n, - I_TRUE); + true); if (d == 0) { @@ -2320,7 +2318,7 @@ AST_Expression::eval_symbol (AST_Expression::EvalKind ek) return c->constant_value ()->eval_internal (ek); } -idl_bool +bool AST_Expression::type_mismatch (AST_Expression::ExprType t) { if (this->pd_ev != 0) @@ -2328,8 +2326,8 @@ AST_Expression::type_mismatch (AST_Expression::ExprType t) return incompatible_types (this->pd_ev->et, t); } - idl_bool v1_mismatch = 0; - idl_bool v2_mismatch = 0; + bool v1_mismatch = 0; + bool v2_mismatch = 0; if (this->pd_v1 != 0) { @@ -2693,7 +2691,7 @@ AST_Expression::compare (AST_Expression *vc) { if (this->pd_ec != vc->ec ()) { - return I_FALSE; + return false; } this->evaluate (EK_const); @@ -2701,68 +2699,68 @@ AST_Expression::compare (AST_Expression *vc) if (this->pd_ev == 0 || vc->ev () == 0) { - return I_FALSE; + return false; } if (this->pd_ev->et != vc->ev ()->et) { - return I_FALSE; + return false; } switch (this->pd_ev->et) { case EV_short: - return this->pd_ev->u.sval == vc->ev ()->u.sval ? I_TRUE : I_FALSE; + return this->pd_ev->u.sval == vc->ev ()->u.sval ? true : false; case EV_ushort: - return this->pd_ev->u.usval == vc->ev ()->u.usval ? I_TRUE : I_FALSE; + return this->pd_ev->u.usval == vc->ev ()->u.usval ? true : false; case EV_long: - return this->pd_ev->u.lval == vc->ev ()->u.lval ? I_TRUE : I_FALSE; + return this->pd_ev->u.lval == vc->ev ()->u.lval ? true : false; case EV_ulong: - return this->pd_ev->u.ulval == vc->ev ()->u.ulval ? I_TRUE : I_FALSE; + return this->pd_ev->u.ulval == vc->ev ()->u.ulval ? true : false; case EV_float: - return this->pd_ev->u.fval == vc->ev ()->u.fval ? I_TRUE : I_FALSE; + return this->pd_ev->u.fval == vc->ev ()->u.fval ? true : false; case EV_double: - return this->pd_ev->u.dval == vc->ev ()->u.dval ? I_TRUE : I_FALSE; + return this->pd_ev->u.dval == vc->ev ()->u.dval ? true : false; case EV_char: - return this->pd_ev->u.cval == vc->ev ()->u.cval ? I_TRUE : I_FALSE; + return this->pd_ev->u.cval == vc->ev ()->u.cval ? true : false; case EV_wchar: - return this->pd_ev->u.wcval == vc->ev ()->u.wcval ? I_TRUE : I_FALSE; + return this->pd_ev->u.wcval == vc->ev ()->u.wcval ? true : false; case EV_octet: - return this->pd_ev->u.oval == vc->ev ()->u.oval ? I_TRUE : I_FALSE; + return this->pd_ev->u.oval == vc->ev ()->u.oval ? true : false; case EV_bool: - return this->pd_ev->u.lval == vc->ev ()->u.lval ? I_TRUE : I_FALSE; + return this->pd_ev->u.lval == vc->ev ()->u.lval ? true : false; case EV_string: if (this->pd_ev->u.strval == 0) { if (vc->ev ()->u.strval == 0) { - return I_TRUE; + return true; } else { - return I_FALSE; + return false; } } else if (vc->ev ()->u.strval == 0) { - return I_FALSE; + return false; } else { - return this->pd_ev->u.strval == vc->ev ()->u.strval ? I_TRUE : I_FALSE; + return this->pd_ev->u.strval == vc->ev ()->u.strval ? true : false; } case EV_longlong: #if ! defined (ACE_LACKS_LONGLONG_T) - return this->pd_ev->u.llval == vc->ev ()->u.llval ? I_TRUE : I_FALSE; + return this->pd_ev->u.llval == vc->ev ()->u.llval ? true : false; #else /* ! defined (ACE_LACKS_LONGLONG_T) */ - return I_FALSE; + return false; #endif /* ! defined (ACE_LACKS_LONGLONG_T) */ case EV_ulonglong: #if ! defined (ACE_LACKS_LONGLONG_T) - return this->pd_ev->u.ullval == vc->ev ()->u.ullval ? I_TRUE : I_FALSE; + return this->pd_ev->u.ullval == vc->ev ()->u.ullval ? true : false; #else /* ! defined (ACE_LACKS_LONGLONG_T) */ - return I_FALSE; + return false; #endif /* ! defined (ACE_LACKS_LONGLONG_T) */ case EV_longdouble: case EV_wstring: @@ -2771,10 +2769,10 @@ AST_Expression::compare (AST_Expression *vc) case EV_none: case EV_any: case EV_object: - return I_FALSE; + return false; } - return I_FALSE; + return false; } AST_Decl * @@ -2850,7 +2848,7 @@ dump_expr_val (ACE_OSTREAM_TYPE &o, o << ev->u.oval; break; case AST_Expression::EV_bool: - o << (ev->u.bval == I_TRUE ? "TRUE" : "FALSE"); + o << (ev->u.bval == true ? "TRUE" : "FALSE"); break; case AST_Expression::EV_string: if (ev->u.strval != 0) diff --git a/TAO/TAO_IDL/ast/ast_factory.cpp b/TAO/TAO_IDL/ast/ast_factory.cpp index f78d0a09027..f168d1d7738 100644 --- a/TAO/TAO_IDL/ast/ast_factory.cpp +++ b/TAO/TAO_IDL/ast/ast_factory.cpp @@ -83,7 +83,7 @@ ACE_RCSID (ast, "$Id$") AST_Factory::AST_Factory (void) - : COMMON_Base (), + : COMMON_Base (), AST_Decl (), UTL_Scope (), pd_exceptions (0), @@ -234,7 +234,7 @@ AST_Factory::fe_add_argument (AST_Argument *t) // Add it to set of locally referenced symbols. this->add_to_referenced (t, - I_FALSE, + false, t->local_name ()); return t; @@ -254,7 +254,7 @@ AST_Factory::fe_add_exceptions (UTL_NameList *t) nl_n = nl_i.item (); d = this->lookup_by_name (nl_n, - I_TRUE); + true); if (d == 0 || d->node_type() != AST_Decl::NT_except) { diff --git a/TAO/TAO_IDL/ast/ast_generator.cpp b/TAO/TAO_IDL/ast/ast_generator.cpp index 474c6f6d9f8..d1ee63b8357 100644 --- a/TAO/TAO_IDL/ast/ast_generator.cpp +++ b/TAO/TAO_IDL/ast/ast_generator.cpp @@ -98,8 +98,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "ast_generator.h" -ACE_RCSID (ast, - ast_generator, +ACE_RCSID (ast, + ast_generator, "$Id$") AST_PredefinedType * @@ -202,8 +202,8 @@ AST_Generator::create_interface (UTL_ScopedName *n, long n_inherits, AST_Interface **inherits_flat, long n_inherits_flat, - idl_bool local, - idl_bool abstract) + bool local, + bool abstract) { AST_Interface *retval = 0; ACE_NEW_RETURN (retval, @@ -221,8 +221,8 @@ AST_Generator::create_interface (UTL_ScopedName *n, AST_InterfaceFwd * AST_Generator::create_interface_fwd (UTL_ScopedName *n, - idl_bool local, - idl_bool abstract) + bool local, + bool abstract) { AST_InterfaceFwd *retval = 0; ACE_NEW_RETURN (retval, @@ -249,9 +249,9 @@ AST_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) { AST_ValueType *retval = 0; ACE_NEW_RETURN (retval, @@ -282,7 +282,7 @@ AST_Generator::create_valuetype (UTL_ScopedName *n, AST_ValueTypeFwd * AST_Generator::create_valuetype_fwd (UTL_ScopedName *n, - idl_bool abstract) + bool abstract) { AST_ValueType *dummy = this->create_valuetype (n, 0, @@ -294,8 +294,8 @@ AST_Generator::create_valuetype_fwd (UTL_ScopedName *n, 0, 0, abstract, - I_FALSE, - I_FALSE); + false, + false); AST_ValueTypeFwd *retval = 0; ACE_NEW_RETURN (retval, @@ -316,9 +316,9 @@ AST_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) { AST_EventType *retval = 0; ACE_NEW_RETURN (retval, @@ -349,7 +349,7 @@ AST_Generator::create_eventtype (UTL_ScopedName *n, AST_EventTypeFwd * AST_Generator::create_eventtype_fwd (UTL_ScopedName *n, - idl_bool abstract) + bool abstract) { AST_EventType *dummy = this->create_eventtype (n, 0, @@ -361,8 +361,8 @@ AST_Generator::create_eventtype_fwd (UTL_ScopedName *n, 0, 0, abstract, - I_FALSE, - I_FALSE); + false, + false); AST_EventTypeFwd *retval = 0; ACE_NEW_RETURN (retval, @@ -440,8 +440,8 @@ AST_Generator::create_home (UTL_ScopedName *n, AST_Exception * AST_Generator::create_exception (UTL_ScopedName *n, - idl_bool local, - idl_bool abstract) + bool local, + bool abstract) { AST_Exception *retval = 0; ACE_NEW_RETURN (retval, @@ -455,8 +455,8 @@ AST_Generator::create_exception (UTL_ScopedName *n, AST_Structure * AST_Generator::create_structure (UTL_ScopedName *n, - idl_bool local, - idl_bool abstract) + bool local, + bool abstract) { AST_Structure *retval = 0; ACE_NEW_RETURN (retval, @@ -485,8 +485,8 @@ AST_Generator::create_structure_fwd (UTL_ScopedName *n) AST_Enum * AST_Generator::create_enum (UTL_ScopedName *n, - idl_bool local, - idl_bool abstract) + bool local, + bool abstract) { AST_Enum *retval = 0; ACE_NEW_RETURN (retval, @@ -502,8 +502,8 @@ AST_Operation * AST_Generator::create_operation (AST_Type *rt, AST_Operation::Flags fl, UTL_ScopedName *n, - idl_bool local, - idl_bool abstract) + bool local, + bool abstract) { AST_Operation *retval = 0; ACE_NEW_RETURN (retval, @@ -548,11 +548,11 @@ AST_Generator::create_argument (AST_Argument::Direction d, } AST_Attribute * -AST_Generator::create_attribute (idl_bool ro, +AST_Generator::create_attribute (bool ro, AST_Type *ft, UTL_ScopedName *n, - idl_bool local, - idl_bool abstract) + bool local, + bool abstract) { AST_Attribute *retval = 0; ACE_NEW_RETURN (retval, @@ -569,8 +569,8 @@ AST_Generator::create_attribute (idl_bool ro, AST_Union * AST_Generator::create_union (AST_ConcreteType *dt, UTL_ScopedName *n, - idl_bool local, - idl_bool abstract) + bool local, + bool abstract) { AST_Union *retval = 0; ACE_NEW_RETURN (retval, @@ -693,13 +693,11 @@ AST_Generator::create_expr (long v) } AST_Expression * -AST_Generator::create_expr (long v, - AST_Expression::ExprType t) +AST_Generator::create_expr (bool b) { AST_Expression *retval = 0; ACE_NEW_RETURN (retval, - AST_Expression (v, - t), + AST_Expression (b), 0); return retval; @@ -711,7 +709,7 @@ AST_Generator::create_expr (idl_uns_long v, { AST_Expression *retval = 0; ACE_NEW_RETURN (retval, - AST_Expression (v, + AST_Expression (v, t), 0); @@ -790,8 +788,8 @@ AST_Array * AST_Generator::create_array (UTL_ScopedName *n, unsigned long ndims, UTL_ExprList *dims, - idl_bool local, - idl_bool abstract) + bool local, + bool abstract) { AST_Array *retval = 0; ACE_NEW_RETURN (retval, @@ -809,8 +807,8 @@ AST_Sequence * AST_Generator::create_sequence (AST_Expression *ms, AST_Type *bt, UTL_ScopedName *n, - idl_bool local, - idl_bool abstract) + bool local, + bool abstract) { AST_Sequence *retval = 0; ACE_NEW_RETURN (retval, @@ -867,8 +865,8 @@ AST_Generator::create_wstring (AST_Expression *ms) AST_Typedef * AST_Generator::create_typedef (AST_Type *bt, UTL_ScopedName *n, - idl_bool local, - idl_bool abstract) + bool local, + bool abstract) { AST_Typedef *retval = 0; ACE_NEW_RETURN (retval, diff --git a/TAO/TAO_IDL/ast/ast_home.cpp b/TAO/TAO_IDL/ast/ast_home.cpp index 865a6d122d9..1b927cbcbdf 100644 --- a/TAO/TAO_IDL/ast/ast_home.cpp +++ b/TAO/TAO_IDL/ast/ast_home.cpp @@ -10,8 +10,8 @@ #include "utl_err.h" #include "global_extern.h" -ACE_RCSID (ast, - ast_home, +ACE_RCSID (ast, + ast_home, "$Id$") AST_Home::AST_Home (void) @@ -34,8 +34,8 @@ AST_Home::AST_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, @@ -46,8 +46,8 @@ AST_Home::AST_Home (UTL_ScopedName *n, n_supports, supports_flat, n_supports_flat, - I_FALSE, - I_FALSE), + false, + false), pd_base_home (base_home), pd_managed_component (managed_component), pd_primary_key (primary_key) @@ -64,22 +64,22 @@ AST_Home::~AST_Home (void) AST_Decl * AST_Home::look_in_inherited (UTL_ScopedName *e, - idl_bool treat_as_ref) + bool treat_as_ref) { AST_Decl *d = 0; - + if (this->pd_base_home != 0) { d = this->pd_base_home->lookup_by_name (e, treat_as_ref); } - + return d; } // Look through supported interface list. AST_Decl * AST_Home::look_in_supported (UTL_ScopedName *e, - idl_bool treat_as_ref) + bool treat_as_ref) { AST_Decl *d = 0; AST_Interface **is = 0; @@ -110,7 +110,7 @@ AST_Home::look_in_supported (UTL_ScopedName *e, break; } } - + return d; } @@ -129,7 +129,7 @@ AST_Home::supports (void) const return this->pd_base_home ? this->inherits () + 1 : this->inherits (); } -long +long AST_Home::n_supports (void) const { return this->n_inherits (); diff --git a/TAO/TAO_IDL/ast/ast_interface.cpp b/TAO/TAO_IDL/ast/ast_interface.cpp index 791e335f79e..27f1889db0f 100644 --- a/TAO/TAO_IDL/ast/ast_interface.cpp +++ b/TAO/TAO_IDL/ast/ast_interface.cpp @@ -110,10 +110,10 @@ AST_Interface::AST_Interface (void) pd_n_inherits (0), pd_inherits_flat (0), pd_n_inherits_flat (0), - home_equiv_ (I_FALSE) + home_equiv_ (false) { this->size_type (AST_Type::VARIABLE); // Always the case. - this->has_constructor (I_TRUE); // Always the case. + this->has_constructor (true); // Always the case. } AST_Interface::AST_Interface (UTL_ScopedName *n, @@ -121,8 +121,8 @@ AST_Interface::AST_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, @@ -134,10 +134,10 @@ AST_Interface::AST_Interface (UTL_ScopedName *n, pd_n_inherits (nih), pd_inherits_flat (ih_flat), pd_n_inherits_flat (nih_flat), - home_equiv_ (I_FALSE) + home_equiv_ (false) { this->size_type (AST_Type::VARIABLE); // always the case - this->has_constructor (I_TRUE); // always the case + this->has_constructor (true); // always the case } AST_Interface::~AST_Interface (void) @@ -177,7 +177,7 @@ AST_Interface::fe_add_constant (AST_Constant *t) } // Already defined and cannot be redefined? Or already used? - if ((d = this->lookup_for_add (t, I_FALSE)) != 0) + if ((d = this->lookup_for_add (t, false)) != 0) { if (!can_be_redefined (d)) { @@ -210,7 +210,7 @@ AST_Interface::fe_add_constant (AST_Constant *t) // Add it to set of locally referenced symbols. this->add_to_referenced (t, - I_FALSE, + false, t->local_name ()); return t; @@ -232,7 +232,7 @@ AST_Interface::fe_add_exception (AST_Exception *t) } // Already defined and cannot be redefined? Or already used? - if ((d = this->lookup_for_add (t, I_FALSE)) != 0) + if ((d = this->lookup_for_add (t, false)) != 0) { if (!can_be_redefined (d)) { @@ -265,7 +265,7 @@ AST_Interface::fe_add_exception (AST_Exception *t) // Add it to set of locally referenced symbols. this->add_to_referenced (t, - I_FALSE, + false, t->local_name ()); return t; @@ -288,7 +288,7 @@ AST_Interface::fe_add_attribute (AST_Attribute *t) /* * Already defined and cannot be redefined? Or already used? */ - if ((d = this->lookup_for_add (t, I_FALSE)) != 0) + if ((d = this->lookup_for_add (t, false)) != 0) { if (!can_be_redefined (d)) { @@ -321,7 +321,7 @@ AST_Interface::fe_add_attribute (AST_Attribute *t) // Add it to set of locally referenced symbols. this->add_to_referenced (t, - I_FALSE, + false, t->local_name ()); return t; @@ -335,7 +335,7 @@ AST_Interface::fe_add_field (AST_Field *t) AST_Decl *d = 0; // Already defined and cannot be redefined? Or already used? - if ((d = this->lookup_for_add (t, I_FALSE)) != 0) + if ((d = this->lookup_for_add (t, false)) != 0) { if (!can_be_redefined (d)) { @@ -368,7 +368,7 @@ AST_Interface::fe_add_field (AST_Field *t) // Add it to set of locally referenced symbols. this->add_to_referenced (t, - I_FALSE, + false, t->local_name ()); AST_Type *ft = t->field_type (); @@ -377,7 +377,7 @@ AST_Interface::fe_add_field (AST_Field *t) if (mru != 0) { this->add_to_referenced (ft, - I_FALSE, + false, mru->first_component ()); } @@ -400,7 +400,7 @@ AST_Interface::fe_add_operation (AST_Operation *t) } // Already defined and cannot be redefined? Or already used? - if ((d = this->lookup_for_add (t, I_FALSE)) != 0) + if ((d = this->lookup_for_add (t, false)) != 0) { if (!can_be_redefined (d)) { @@ -427,7 +427,7 @@ AST_Interface::fe_add_operation (AST_Operation *t) return 0; } } - else if ((d = this->look_in_inherited (t->name (), I_FALSE)) != 0) + else if ((d = this->look_in_inherited (t->name (), false)) != 0) { if (d->node_type () == AST_Decl::NT_op) { @@ -444,7 +444,7 @@ AST_Interface::fe_add_operation (AST_Operation *t) // Add it to set of locally referenced symbols. this->add_to_referenced (t, - I_FALSE, + false, t->local_name ()); return t; @@ -457,7 +457,7 @@ AST_Interface::fe_add_structure (AST_Structure *t) AST_Decl *predef = 0; AST_StructureFwd *fwd = 0; - if ((predef = this->lookup_for_add (t, I_FALSE)) != 0) + if ((predef = this->lookup_for_add (t, false)) != 0) { // Treat fwd declared interfaces specially if (predef->node_type () == AST_Decl::NT_struct_fwd) @@ -523,7 +523,7 @@ AST_Interface::fe_add_structure (AST_Structure *t) // Add it to set of locally referenced symbols. this->add_to_referenced (t, - I_FALSE, + false, t->local_name ()); return t; @@ -537,7 +537,7 @@ AST_Interface::fe_add_structure_fwd (AST_StructureFwd *t) AST_Decl *d = 0; // Already defined and cannot be redefined? Or already used? - if ((d = this->lookup_for_add (t, I_FALSE)) != 0) + if ((d = this->lookup_for_add (t, false)) != 0) { AST_Decl::NodeType nt = d->node_type (); @@ -598,7 +598,7 @@ AST_Interface::fe_add_structure_fwd (AST_StructureFwd *t) // Add it to set of locally referenced symbols this->add_to_referenced (t, - I_FALSE, + false, t->local_name ()); // Must check later that all struct and union forward declarations @@ -623,7 +623,7 @@ AST_Interface::fe_add_enum (AST_Enum *t) } // Already defined and cannot be redefined? Or already used? - if ((d = this->lookup_for_add (t, I_FALSE)) != 0) + if ((d = this->lookup_for_add (t, false)) != 0) { if (!can_be_redefined (d)) { @@ -656,7 +656,7 @@ AST_Interface::fe_add_enum (AST_Enum *t) // Add it to set of locally referenced symbols. this->add_to_referenced (t, - I_FALSE, + false, t->local_name ()); return t; @@ -669,7 +669,7 @@ AST_Interface::fe_add_union (AST_Union *t) AST_Decl *predef = 0; AST_UnionFwd *fwd = 0; - if ((predef = this->lookup_for_add (t, I_FALSE)) != 0) + if ((predef = this->lookup_for_add (t, false)) != 0) { // Treat fwd declared interfaces specially if (predef->node_type () == AST_Decl::NT_union_fwd) @@ -735,7 +735,7 @@ AST_Interface::fe_add_union (AST_Union *t) // Add it to set of locally referenced symbols. this->add_to_referenced (t, - I_FALSE, + false, t->local_name ()); return t; @@ -749,7 +749,7 @@ AST_Interface::fe_add_union_fwd (AST_UnionFwd *t) AST_Decl *d = 0; // Already defined and cannot be redefined? Or already used? - if ((d = this->lookup_for_add (t, I_FALSE)) != 0) + if ((d = this->lookup_for_add (t, false)) != 0) { AST_Decl::NodeType nt = d->node_type (); @@ -810,7 +810,7 @@ AST_Interface::fe_add_union_fwd (AST_UnionFwd *t) // Add it to set of locally referenced symbols this->add_to_referenced (t, - I_FALSE, + false, t->local_name ()); // Must check later that all struct and union forward declarations @@ -838,7 +838,7 @@ AST_Interface::fe_add_enum_val (AST_EnumVal *t) } // Already defined and cannot be redefined? Or already used? - if ((d = this->lookup_for_add (t, I_FALSE)) != 0) + if ((d = this->lookup_for_add (t, false)) != 0) { if (!can_be_redefined (d)) { @@ -871,7 +871,7 @@ AST_Interface::fe_add_enum_val (AST_EnumVal *t) // Add it to set of locally referenced symbols. this->add_to_referenced (t, - I_FALSE, + false, t->local_name ()); return t; @@ -893,7 +893,7 @@ AST_Interface::fe_add_typedef (AST_Typedef *t) } // Already defined and cannot be redefined? Or already used? - if ((d = this->lookup_for_add (t, I_FALSE)) != 0) + if ((d = this->lookup_for_add (t, false)) != 0) { if (!can_be_redefined (d)) { @@ -926,7 +926,7 @@ AST_Interface::fe_add_typedef (AST_Typedef *t) // Add it to set of locally referenced symbols. this->add_to_referenced (t, - I_FALSE, + false, t->local_name ()); AST_Type *bt = t->base_type (); @@ -936,7 +936,7 @@ AST_Interface::fe_add_typedef (AST_Typedef *t) { this->add_to_referenced ( bt, - I_FALSE, + false, mru->first_component () ); } @@ -960,7 +960,7 @@ AST_Interface::fe_add_native (AST_Native *t) } // Already defined and cannot be redefined? Or already used? - if ((d = this->lookup_for_add (t, I_FALSE)) != 0) + if ((d = this->lookup_for_add (t, false)) != 0) { if (!can_be_redefined (d)) { @@ -993,7 +993,7 @@ AST_Interface::fe_add_native (AST_Native *t) // Add it to set of locally referenced symbols. this->add_to_referenced (t, - I_FALSE, + false, t->local_name ()); return t; @@ -1219,21 +1219,21 @@ AST_Interface::redef_clash_populate_r (AST_Interface *t) } } -idl_bool +bool AST_Interface::home_equiv (void) const { return this->home_equiv_; } void -AST_Interface::home_equiv (idl_bool val) +AST_Interface::home_equiv (bool val) { this->home_equiv_ = val; } int AST_Interface::insert_non_dup (AST_Interface *t, - idl_bool abstract_paths_only) + bool abstract_paths_only) { // Now check if the dequeued element has any ancestors. If yes, insert // them inside the queue making sure that there are no duplicates. @@ -1371,7 +1371,7 @@ AST_Interface::get_del_queue (void) return this->del_queue; } -idl_bool +bool AST_Interface::redef_clash (void) { this->insert_queue.reset (); @@ -1454,7 +1454,7 @@ AST_Interface::redef_clash (void) Identifier *pid2 = group2_member_item->local_name (); - if (pid1->compare (pid2) == I_TRUE) + if (pid1->compare (pid2) == true) { idl_global->err ()->error3 ( UTL_Error::EIDL_REDEF, @@ -1464,7 +1464,7 @@ AST_Interface::redef_clash (void) ); return 1; } - else if (pid1->case_compare_quiet (pid2) == I_TRUE) + else if (pid1->case_compare_quiet (pid2) == true) { if (idl_global->case_diff_error ()) { @@ -1498,7 +1498,7 @@ AST_Interface::redef_clash (void) // Look through inherited interfaces. AST_Decl * AST_Interface::look_in_inherited (UTL_ScopedName *e, - idl_bool treat_as_ref) + bool treat_as_ref) { AST_Decl *d = 0; AST_Decl *d_before = 0; @@ -1567,7 +1567,7 @@ AST_Interface::look_in_inherited (UTL_ScopedName *e, AST_Decl * AST_Interface::lookup_for_add (AST_Decl *d, - idl_bool /* treat_as_ref */) + bool /* treat_as_ref */) { if (d == 0) { diff --git a/TAO/TAO_IDL/ast/ast_interface_fwd.cpp b/TAO/TAO_IDL/ast/ast_interface_fwd.cpp index 9f1dd7028d9..ad57956a211 100644 --- a/TAO/TAO_IDL/ast/ast_interface_fwd.cpp +++ b/TAO/TAO_IDL/ast/ast_interface_fwd.cpp @@ -74,8 +74,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "ast_visitor.h" #include "utl_identifier.h" -ACE_RCSID( ast, - ast_interface_fwd, +ACE_RCSID( ast, + ast_interface_fwd, "$Id$") AST_InterfaceFwd::AST_InterfaceFwd (void) @@ -107,18 +107,18 @@ AST_InterfaceFwd::~AST_InterfaceFwd (void) // Private operations. -idl_bool +bool AST_InterfaceFwd::is_local (void) { return this->full_definition ()->is_local (); } -idl_bool AST_InterfaceFwd::is_valuetype (void) +bool AST_InterfaceFwd::is_valuetype (void) { return this->full_definition ()->node_type () == AST_Decl::NT_valuetype; } -idl_bool +bool AST_InterfaceFwd::is_abstract_valuetype (void) { return (this->full_definition ()->is_abstract () @@ -167,7 +167,7 @@ AST_InterfaceFwd::set_full_definition (AST_Interface *nfd) this->pd_full_definition = nfd; } -idl_bool +bool AST_InterfaceFwd::is_defined (void) { return this->pd_full_definition->is_defined (); diff --git a/TAO/TAO_IDL/ast/ast_module.cpp b/TAO/TAO_IDL/ast/ast_module.cpp index eb7aff2a1bc..f3c43f66947 100644 --- a/TAO/TAO_IDL/ast/ast_module.cpp +++ b/TAO/TAO_IDL/ast/ast_module.cpp @@ -127,7 +127,7 @@ AST_Module::fe_add_predefined_type (AST_PredefinedType *t) AST_Decl *d = 0; // Already defined and cannot be redefined? Or already used? - if ((d = this->lookup_for_add (t, I_FALSE)) != 0) + if ((d = this->lookup_for_add (t, false)) != 0) { if (!can_be_redefined (d)) { @@ -160,7 +160,7 @@ AST_Module::fe_add_predefined_type (AST_PredefinedType *t) // Add it to set of locally referenced symbols. this->add_to_referenced (t, - I_FALSE, + false, t->local_name ()); return t; @@ -193,7 +193,7 @@ AST_Module::fe_add_module (AST_Module *t) } // Already defined and cannot be redefined? Or already used? - if ((d = this->lookup_for_add (t, I_FALSE)) != 0) + if ((d = this->lookup_for_add (t, false)) != 0) { if (!can_be_redefined (d)) { @@ -252,7 +252,7 @@ AST_Module::fe_add_module (AST_Module *t) // Add it to set of locally referenced symbols. this->add_to_referenced (t, - I_FALSE, + false, t->local_name ()); } @@ -272,7 +272,7 @@ AST_Module::fe_add_interface (AST_Interface *t) AST_Interface *fwd = 0; // Already defined? - if ((predef = this->lookup_for_add (t, I_FALSE)) != 0) + if ((predef = this->lookup_for_add (t, false)) != 0) { // Treat fwd declared interfaces specially if (predef->node_type () == AST_Decl::NT_interface) @@ -342,7 +342,7 @@ AST_Module::fe_add_interface (AST_Interface *t) // Add it to set of locally referenced symbols this->add_to_referenced (t, - I_FALSE, + false, t->local_name ()); return t; } @@ -355,7 +355,7 @@ AST_Module::fe_add_valuebox (AST_ValueBox *t) AST_Decl *predef = 0; // Already defined and cannot be redefined? Or already used? - if ((predef = this->lookup_for_add (t, I_FALSE)) != 0) + if ((predef = this->lookup_for_add (t, false)) != 0) { if (!can_be_redefined (predef)) { @@ -389,7 +389,7 @@ AST_Module::fe_add_valuebox (AST_ValueBox *t) // Add it to set of locally referenced symbols this->add_to_referenced (t, - I_FALSE, + false, t->local_name ()); return t; } @@ -408,7 +408,7 @@ AST_Module::fe_add_valuetype (AST_ValueType *t) AST_ValueType *fwd = 0; // Already defined? - if ((predef = this->lookup_for_add (t, I_FALSE)) != 0) + if ((predef = this->lookup_for_add (t, false)) != 0) { // Treat fwd declared interfaces specially if (predef->node_type () == AST_Decl::NT_valuetype) @@ -477,7 +477,7 @@ AST_Module::fe_add_valuetype (AST_ValueType *t) // Add it to set of locally referenced symbols this->add_to_referenced (t, - I_FALSE, + false, t->local_name ()); return t; } @@ -495,7 +495,7 @@ AST_Module::fe_add_eventtype (AST_EventType *t) AST_EventType *fwd = 0; // Already defined? - if ((predef = this->lookup_for_add (t, I_FALSE)) != 0) + if ((predef = this->lookup_for_add (t, false)) != 0) { // Treat fwd declared interfaces specially if (predef->node_type () == AST_Decl::NT_eventtype) @@ -564,7 +564,7 @@ AST_Module::fe_add_eventtype (AST_EventType *t) // Add it to set of locally referenced symbols this->add_to_referenced (t, - I_FALSE, + false, t->local_name ()); return t; } @@ -582,7 +582,7 @@ AST_Module::fe_add_component (AST_Component *t) AST_Component *fwd = 0; // Already defined? - if ((predef = this->lookup_for_add (t, I_FALSE)) != 0) + if ((predef = this->lookup_for_add (t, false)) != 0) { // Treat fwd declared interfaces specially if (predef->node_type () == AST_Decl::NT_component) @@ -651,7 +651,7 @@ AST_Module::fe_add_component (AST_Component *t) // Add it to set of locally referenced symbols this->add_to_referenced (t, - I_FALSE, + false, t->local_name ()); return t; } @@ -663,7 +663,7 @@ AST_Module::fe_add_home (AST_Home *t) AST_Decl *d = 0; // Already defined and cannot be redefined? Or already used? - if ((d = this->lookup_for_add (t, I_FALSE)) != 0) + if ((d = this->lookup_for_add (t, false)) != 0) { if (!can_be_redefined (d)) { @@ -709,7 +709,7 @@ AST_Module::fe_add_interface_fwd (AST_InterfaceFwd *i) AST_Decl *d = 0; // Already defined and cannot be redefined? Or already used? - if ((d = this->lookup_for_add (i, I_FALSE)) != 0) + if ((d = this->lookup_for_add (i, false)) != 0) { AST_Decl::NodeType nt = d->node_type (); @@ -770,7 +770,7 @@ AST_Module::fe_add_interface_fwd (AST_InterfaceFwd *i) // Add it to set of locally referenced symbols this->add_to_referenced (i, - I_FALSE, + false, i->local_name ()); return i; @@ -784,7 +784,7 @@ AST_Module::fe_add_valuetype_fwd (AST_ValueTypeFwd *v) AST_Decl *d = 0; // Already defined and cannot be redefined? Or already used? - if ((d = this->lookup_for_add (v, I_FALSE)) != 0) + if ((d = this->lookup_for_add (v, false)) != 0) { AST_Decl::NodeType nt = d->node_type (); @@ -851,7 +851,7 @@ AST_Module::fe_add_valuetype_fwd (AST_ValueTypeFwd *v) // Add it to set of locally referenced symbols this->add_to_referenced (v, - I_FALSE, + false, v->local_name ()); return v; @@ -865,7 +865,7 @@ AST_Module::fe_add_eventtype_fwd (AST_EventTypeFwd *v) AST_Decl *d = 0; // Already defined and cannot be redefined? Or already used? - if ((d = this->lookup_for_add (v, I_FALSE)) != 0) + if ((d = this->lookup_for_add (v, false)) != 0) { AST_Decl::NodeType nt = d->node_type (); @@ -932,7 +932,7 @@ AST_Module::fe_add_eventtype_fwd (AST_EventTypeFwd *v) // Add it to set of locally referenced symbols this->add_to_referenced (v, - I_FALSE, + false, v->local_name ()); return v; @@ -946,7 +946,7 @@ AST_Module::fe_add_component_fwd (AST_ComponentFwd *c) AST_Decl *d = 0; // Already defined and cannot be redefined? Or already used? - if ((d = this->lookup_for_add (c, I_FALSE)) != 0) + if ((d = this->lookup_for_add (c, false)) != 0) { AST_Decl::NodeType nt = d->node_type (); @@ -1013,7 +1013,7 @@ AST_Module::fe_add_component_fwd (AST_ComponentFwd *c) // Add it to set of locally referenced symbols this->add_to_referenced (c, - I_FALSE, + false, c->local_name ()); return c; @@ -1026,7 +1026,7 @@ AST_Module::fe_add_constant (AST_Constant *t) AST_Decl *d = 0; // Already defined and cannot be redefined? Or already used? - if ((d = this->lookup_for_add (t, I_FALSE)) != 0) + if ((d = this->lookup_for_add (t, false)) != 0) { if (!can_be_redefined (d)) { @@ -1059,7 +1059,7 @@ AST_Module::fe_add_constant (AST_Constant *t) // Add it to set of locally referenced symbols. this->add_to_referenced (t, - I_FALSE, + false, t->local_name ()); return t; @@ -1072,7 +1072,7 @@ AST_Module::fe_add_exception (AST_Exception *t) AST_Decl *d = 0; // Already defined and cannot be redefined? Or already used? - if ((d = this->lookup_for_add (t, I_FALSE)) != 0) + if ((d = this->lookup_for_add (t, false)) != 0) { if (!can_be_redefined (d)) { @@ -1105,7 +1105,7 @@ AST_Module::fe_add_exception (AST_Exception *t) // Add it to set of locally referenced symbols. this->add_to_referenced (t, - I_FALSE, + false, t->local_name ()); return t; @@ -1116,7 +1116,7 @@ AST_Union * AST_Module::fe_add_union (AST_Union *t) { AST_UnionFwd *fwd = 0; - AST_Decl *predef = this->lookup_for_add (t, I_FALSE); + AST_Decl *predef = this->lookup_for_add (t, false); if (predef != 0) { @@ -1188,7 +1188,7 @@ AST_Module::fe_add_union (AST_Union *t) // Add it to set of locally referenced symbols. this->add_to_referenced (t, - I_FALSE, + false, t->local_name ()); return t; @@ -1202,7 +1202,7 @@ AST_Module::fe_add_union_fwd (AST_UnionFwd *t) AST_Decl *d = 0; // Already defined and cannot be redefined? Or already used? - if ((d = this->lookup_for_add (t, I_FALSE)) != 0) + if ((d = this->lookup_for_add (t, false)) != 0) { AST_Decl::NodeType nt = d->node_type (); @@ -1262,7 +1262,7 @@ AST_Module::fe_add_union_fwd (AST_UnionFwd *t) // Add it to set of locally referenced symbols this->add_to_referenced (t, - I_FALSE, + false, t->local_name ()); // Must check later that all struct and union forward declarations @@ -1278,7 +1278,7 @@ AST_Module::fe_add_structure (AST_Structure *t) AST_Decl *predef = 0; AST_StructureFwd *fwd = 0; - if ((predef = this->lookup_for_add (t, I_FALSE)) != 0) + if ((predef = this->lookup_for_add (t, false)) != 0) { // Treat fwd declared interfaces specially if (predef->node_type () == AST_Decl::NT_struct_fwd) @@ -1348,7 +1348,7 @@ AST_Module::fe_add_structure (AST_Structure *t) // Add it to set of locally referenced symbols. this->add_to_referenced (t, - I_FALSE, + false, t->local_name ()); return t; @@ -1362,7 +1362,7 @@ AST_Module::fe_add_structure_fwd (AST_StructureFwd *t) AST_Decl *d = 0; // Already defined and cannot be redefined? Or already used? - if ((d = this->lookup_for_add (t, I_FALSE)) != 0) + if ((d = this->lookup_for_add (t, false)) != 0) { AST_Decl::NodeType nt = d->node_type (); @@ -1422,7 +1422,7 @@ AST_Module::fe_add_structure_fwd (AST_StructureFwd *t) // Add it to set of locally referenced symbols this->add_to_referenced (t, - I_FALSE, + false, t->local_name ()); // Must check later that all struct and union forward declarations @@ -1438,7 +1438,7 @@ AST_Module::fe_add_enum (AST_Enum *t) AST_Decl *d = 0; // Already defined and cannot be redefined? Or already used? - if ((d = this->lookup_for_add (t, I_FALSE)) != 0) + if ((d = this->lookup_for_add (t, false)) != 0) { if (!can_be_redefined (d)) { @@ -1471,7 +1471,7 @@ AST_Module::fe_add_enum (AST_Enum *t) // Add it to set of locally referenced symbols. this->add_to_referenced (t, - I_FALSE, + false, t->local_name ()); return t; @@ -1487,7 +1487,7 @@ AST_Module::fe_add_enum_val (AST_EnumVal *t) AST_Decl *d = 0; // Already defined and cannot be redefined? Or already used? - if ((d = this->lookup_for_add(t, I_FALSE)) != 0) + if ((d = this->lookup_for_add(t, false)) != 0) { if (!can_be_redefined (d)) { @@ -1520,7 +1520,7 @@ AST_Module::fe_add_enum_val (AST_EnumVal *t) // Add it to set of locally referenced symbols. this->add_to_referenced (t, - I_FALSE, + false, t->local_name ()); return t; @@ -1533,7 +1533,7 @@ AST_Module::fe_add_typedef (AST_Typedef *t) AST_Decl *d = 0; // Already defined and cannot be redefined? Or already used? - if ((d = this->lookup_for_add(t, I_FALSE)) != 0) + if ((d = this->lookup_for_add(t, false)) != 0) { if (!can_be_redefined (d)) { @@ -1566,7 +1566,7 @@ AST_Module::fe_add_typedef (AST_Typedef *t) // Add it to set of locally referenced symbols. this->add_to_referenced (t, - I_FALSE, + false, t->local_name ()); AST_Type *bt = t->base_type (); @@ -1575,7 +1575,7 @@ AST_Module::fe_add_typedef (AST_Typedef *t) if (mru != 0) { this->add_to_referenced (bt, - I_FALSE, + false, mru->first_component ()); } @@ -1589,7 +1589,7 @@ AST_Module::fe_add_native (AST_Native *t) AST_Decl *d = 0; // Already defined and cannot be redefined? Or already used? - if ((d = this->lookup_for_add (t, I_FALSE)) != 0) + if ((d = this->lookup_for_add (t, false)) != 0) { if (!can_be_redefined (d)) { @@ -1622,7 +1622,7 @@ AST_Module::fe_add_native (AST_Native *t) // Add it to set of locally referenced symbols. this->add_to_referenced (t, - I_FALSE, + false, t->local_name ()); return t; @@ -1660,7 +1660,7 @@ AST_Module::set_has_nested_valuetype (void) this->pd_has_nested_valuetype = 1; } -idl_bool +bool AST_Module::has_nested_valuetype (void) { return this->pd_has_nested_valuetype; @@ -1676,7 +1676,7 @@ AST_Module::be_add_interface (AST_Interface *i, // Add it to set of locally referenced symbols. this->add_to_referenced (i, - I_FALSE, + false, i->local_name (), ix); @@ -1684,17 +1684,17 @@ AST_Module::be_add_interface (AST_Interface *i, } // Has this node been referenced here before? -idl_bool +bool AST_Module::referenced (AST_Decl *e, Identifier *id) { - idl_bool refd = this->UTL_Scope::referenced (e, id); - + bool refd = this->UTL_Scope::referenced (e, id); + if (refd) { - return I_TRUE; + return true; } - + return this->look_in_previous (e->local_name (), true) != 0; } @@ -1763,11 +1763,11 @@ AST_Module::look_in_previous (Identifier *e, bool ignore_fwd) iter.advance ()) { iter.next (d); - + if (ignore_fwd) { AST_Decl::NodeType nt = (*d)->node_type (); - + if (nt == AST_Decl::NT_interface_fwd || nt == AST_Decl::NT_eventtype_fwd || nt == AST_Decl::NT_component_fwd diff --git a/TAO/TAO_IDL/ast/ast_native.cpp b/TAO/TAO_IDL/ast/ast_native.cpp index c9bf8bd59d2..baf2ff321be 100644 --- a/TAO/TAO_IDL/ast/ast_native.cpp +++ b/TAO/TAO_IDL/ast/ast_native.cpp @@ -3,8 +3,8 @@ #include "ast_native.h" #include "ast_visitor.h" -ACE_RCSID (ast, - ast_native, +ACE_RCSID (ast, + ast_native, "$Id$") AST_Native::AST_Native (void) @@ -29,11 +29,11 @@ AST_Native::AST_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) { } diff --git a/TAO/TAO_IDL/ast/ast_operation.cpp b/TAO/TAO_IDL/ast/ast_operation.cpp index 5a98f6298cd..fd4abf11824 100644 --- a/TAO/TAO_IDL/ast/ast_operation.cpp +++ b/TAO/TAO_IDL/ast/ast_operation.cpp @@ -87,8 +87,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "utl_strlist.h" #include "global_extern.h" -ACE_RCSID (ast, - ast_operation, +ACE_RCSID (ast, + ast_operation, "$Id$") AST_Operation::AST_Operation (void) @@ -107,8 +107,8 @@ AST_Operation::AST_Operation (void) AST_Operation::AST_Operation (AST_Type *rt, 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, @@ -332,7 +332,7 @@ AST_Operation::fe_add_exceptions (UTL_NameList *t) for (UTL_NamelistActiveIterator nl_i (t); !nl_i.is_done (); nl_i.next ()) { nl_n = nl_i.item (); - d = this->lookup_by_name (nl_n, I_TRUE); + d = this->lookup_by_name (nl_n, true); if (d == 0) { @@ -429,7 +429,7 @@ AST_Operation::fe_add_argument (AST_Argument *t) // This error is not caught in y.tab.cpp so we check for it here. if (arg_type->node_type () == AST_Decl::NT_array - && arg_type->anonymous () == I_TRUE) + && arg_type->anonymous () == true) { idl_global->err ()->syntax_error (idl_global->parse_state ()); } @@ -439,7 +439,7 @@ AST_Operation::fe_add_argument (AST_Argument *t) // Add it to set of locally referenced symbols. this->add_to_referenced (t, - I_FALSE, + false, t->local_name ()); UTL_ScopedName *mru = arg_type->last_referenced_as (); @@ -447,7 +447,7 @@ AST_Operation::fe_add_argument (AST_Argument *t) if (mru != 0) { this->add_to_referenced (arg_type, - I_FALSE, + false, mru->first_component ()); } diff --git a/TAO/TAO_IDL/ast/ast_predefined_type.cpp b/TAO/TAO_IDL/ast/ast_predefined_type.cpp index 2360a7ce535..0f45b9b9a34 100644 --- a/TAO/TAO_IDL/ast/ast_predefined_type.cpp +++ b/TAO/TAO_IDL/ast/ast_predefined_type.cpp @@ -96,7 +96,7 @@ AST_PredefinedType::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/ast/ast_recursive.cpp b/TAO/TAO_IDL/ast/ast_recursive.cpp index d95c3cc6cd4..1603b184a0b 100644 --- a/TAO/TAO_IDL/ast/ast_recursive.cpp +++ b/TAO/TAO_IDL/ast/ast_recursive.cpp @@ -84,11 +84,11 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "global_extern.h" #include "nr_extern.h" -ACE_RCSID (ast, - ast_recursive, +ACE_RCSID (ast, + ast_recursive, "$Id$") -idl_bool +bool AST_illegal_interface_recursion (AST_Decl *t) { // Can't be 0 since we know we have an interface or valuetype. @@ -100,34 +100,34 @@ AST_illegal_interface_recursion (AST_Decl *t) i.next ()) { d = ScopeAsDecl (i.item ()); - + // Exceptions cannot be recursive, but may contain a reference // to the interface they are defined in. if (d->node_type () == AST_Decl::NT_except) { - return I_FALSE; + return false; } - + if (d == t) { - return I_TRUE; + return true; } } - return I_FALSE; + return false; } -idl_bool +bool AST_illegal_recursive_type (AST_Decl *t) { if (t == 0) { - return I_FALSE; + return false; } - + AST_Decl::NodeType nt; AST_Type *ut = AST_Type::narrow_from_decl (t); - + if (ut != 0) { ut = ut->unaliased_type (); @@ -137,7 +137,7 @@ AST_illegal_recursive_type (AST_Decl *t) { nt = t->node_type (); } - + if (nt == AST_Decl::NT_interface) { // Check for interface->struct/union->....->interface nesting. @@ -146,37 +146,37 @@ AST_illegal_recursive_type (AST_Decl *t) else if (nt != AST_Decl::NT_struct && nt != AST_Decl::NT_union) { // Structs and unions fall through to the check below. - return I_FALSE; // NOT ILLEGAL. + return false; // NOT ILLEGAL. } - idl_bool check_for_struct = I_FALSE; - idl_bool check_for_union = I_FALSE; - AST_Structure *st1 = 0; - AST_Union *un1 = 0; + bool check_for_struct = false; + bool check_for_union = false; + AST_Structure *st1 = 0; + AST_Union *un1 = 0; // Narrow the type appropriately so comparison will work. if (t->node_type () == AST_Decl::NT_struct) { - check_for_struct = I_TRUE; + check_for_struct = true; st1 = AST_Structure::narrow_from_decl (t); if (st1 == 0) { - return I_FALSE; // NOT ILLEGAL. + return false; // NOT ILLEGAL. } } else if (t->node_type () == AST_Decl::NT_union) { - check_for_union = I_TRUE; + check_for_union = true; un1 = AST_Union::narrow_from_decl (t); if (un1 == 0) { - return I_FALSE; // NOT ILLEGAL. + return false; // NOT ILLEGAL. } } - UTL_Scope *s = 0; + UTL_Scope *s = 0; AST_Structure *st2 = 0; AST_Union *un2 = 0; @@ -191,33 +191,33 @@ AST_illegal_recursive_type (AST_Decl *t) // a sequence, where recursive types may be used. if (s == 0) { - return I_FALSE; // NOT ILLEGAL. + return false; // NOT ILLEGAL. } // OK, must check this scope. if (s->scope_node_type () == AST_Decl::NT_struct - && check_for_struct == I_TRUE) + && check_for_struct == true) { st2 = AST_Structure::narrow_from_scope (s); if (st2 != 0 && st2 == st1) { - return I_TRUE; // ILLEGAL RECURSIVE TYPE USE. + return true; // ILLEGAL RECURSIVE TYPE USE. } } else if (s->scope_node_type () == AST_Decl::NT_union - && check_for_union == I_TRUE) + && check_for_union == true) { un2 = AST_Union::narrow_from_scope (s); if (un2 != 0 && un2 == un1) { - return I_TRUE; // ILLEGAL RECURSIVE TYPE USE. + return true; // ILLEGAL RECURSIVE TYPE USE. } } } // No more scopes to check. This type was used legally. - return I_FALSE; // NOT ILLEGAL. + return false; // NOT ILLEGAL. } diff --git a/TAO/TAO_IDL/ast/ast_redef.cpp b/TAO/TAO_IDL/ast/ast_redef.cpp index d729fe93466..92043ccba80 100644 --- a/TAO/TAO_IDL/ast/ast_redef.cpp +++ b/TAO/TAO_IDL/ast/ast_redef.cpp @@ -66,13 +66,13 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "ast_decl.h" -ACE_RCSID (ast, - ast_redef, +ACE_RCSID (ast, + ast_redef, "$Id$") // Return TRUE if the node d represents an IDL construct whose name // can be redefined. -idl_bool +bool can_be_redefined (AST_Decl *d) { switch (d->node_type ()) @@ -102,7 +102,7 @@ can_be_redefined (AST_Decl *d) case AST_Decl::NT_enum: case AST_Decl::NT_typedef: case AST_Decl::NT_valuebox: - return I_TRUE; + return true; case AST_Decl::NT_union_branch: case AST_Decl::NT_field: @@ -111,7 +111,7 @@ can_be_redefined (AST_Decl *d) case AST_Decl::NT_pre_defined: case AST_Decl::NT_factory: default: - return I_FALSE; + return false; } } diff --git a/TAO/TAO_IDL/ast/ast_sequence.cpp b/TAO/TAO_IDL/ast/ast_sequence.cpp index bf57edf78eb..f580f1ab215 100644 --- a/TAO/TAO_IDL/ast/ast_sequence.cpp +++ b/TAO/TAO_IDL/ast/ast_sequence.cpp @@ -80,8 +80,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "ace/OS_Memory.h" #include "ace/OS_NS_string.h" -ACE_RCSID (ast, - ast_sequence, +ACE_RCSID (ast, + ast_sequence, "$Id$") AST_Sequence::AST_Sequence (void) @@ -99,13 +99,13 @@ AST_Sequence::AST_Sequence (void) AST_Sequence::AST_Sequence (AST_Expression *ms, 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_sequence, n, - I_TRUE), + true), AST_Type (AST_Decl::NT_sequence, n), AST_ConcreteType (AST_Decl::NT_sequence, @@ -117,11 +117,11 @@ AST_Sequence::AST_Sequence (AST_Expression *ms, // unbounded. if (ms->ev ()->u.ulval == 0) { - this->unbounded_ = I_TRUE; + this->unbounded_ = true; } else { - this->unbounded_ = I_FALSE; + this->unbounded_ = false; } // A sequence data type is always VARIABLE. @@ -134,7 +134,7 @@ AST_Sequence::~AST_Sequence (void) // Public operations. -idl_bool +bool AST_Sequence::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list) { // We should calculate this only once. If it has already been @@ -154,16 +154,16 @@ AST_Sequence::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list) ACE_TEXT ("bad base type\n")), 0); } - + if (type->node_type () == AST_Decl::NT_typedef) { AST_Typedef *td = AST_Typedef::narrow_from_decl (type); type = td->primitive_base_type (); AST_Decl::NodeType nt = type->node_type (); - + if (nt != AST_Decl::NT_struct && nt != AST_Decl::NT_union) { - return I_FALSE; + return false; } } @@ -180,12 +180,12 @@ AST_Sequence::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list) ACE_Unbounded_Queue<AST_Type *> scope_list = list; scope_list.enqueue_tail (this); this->in_recursion_ = type->in_recursion (scope_list); - + if (this->in_recursion_ == 1) { idl_global->recursive_type_seen_ = true; } - + return this->in_recursion_; } } @@ -223,7 +223,7 @@ AST_Sequence::base_type (void) const return this->pd_base_type; } -idl_bool +bool AST_Sequence::unbounded (void) const { return this->unbounded_; diff --git a/TAO/TAO_IDL/ast/ast_string.cpp b/TAO/TAO_IDL/ast/ast_string.cpp index bb40ae6a7bf..cb24793fa37 100644 --- a/TAO/TAO_IDL/ast/ast_string.cpp +++ b/TAO/TAO_IDL/ast/ast_string.cpp @@ -101,7 +101,7 @@ AST_String::AST_String (AST_Decl::NodeType nt, : COMMON_Base (), AST_Decl (nt, n, - I_TRUE), + true), AST_Type (nt, n), AST_ConcreteType (nt, diff --git a/TAO/TAO_IDL/ast/ast_structure.cpp b/TAO/TAO_IDL/ast/ast_structure.cpp index c632a6e89ac..371e713b0fe 100644 --- a/TAO/TAO_IDL/ast/ast_structure.cpp +++ b/TAO/TAO_IDL/ast/ast_structure.cpp @@ -77,8 +77,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "utl_err.h" #include "utl_indenter.h" -ACE_RCSID (ast, - ast_structure, +ACE_RCSID (ast, + ast_structure, "$Id$") AST_Structure::AST_Structure (void) @@ -93,8 +93,8 @@ AST_Structure::AST_Structure (void) } AST_Structure::AST_Structure (UTL_ScopedName *n, - idl_bool local, - idl_bool abstract) + bool local, + bool abstract) : COMMON_Base (local, abstract), AST_Decl (AST_Decl::NT_struct, @@ -111,8 +111,8 @@ AST_Structure::AST_Structure (UTL_ScopedName *n, AST_Structure::AST_Structure (AST_Decl::NodeType nt, UTL_ScopedName *n, - idl_bool local, - idl_bool abstract) + bool local, + bool abstract) : COMMON_Base (local, abstract), AST_Decl (nt, @@ -132,7 +132,7 @@ AST_Structure::~AST_Structure (void) } // Are we or the parameter node involved in any recursion? -idl_bool +bool AST_Structure::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list) { // We should calculate this only once. If it has already been @@ -147,11 +147,11 @@ AST_Structure::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list) { ACE_Unbounded_Queue<AST_Type *> scope_list = list; scope_list.enqueue_tail (this); - + // Initialize an iterator to iterate over our scope. // Continue until each element is visited. - for (UTL_ScopeActiveIterator si (this, UTL_Scope::IK_decls); - !si.is_done (); + for (UTL_ScopeActiveIterator si (this, UTL_Scope::IK_decls); + !si.is_done (); si.next ()) { AST_Field *field = AST_Field::narrow_from_decl (si.item ()); @@ -179,7 +179,7 @@ AST_Structure::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list) ACE_TEXT ("bad field type\n")), 0); } - + if (type->in_recursion (scope_list)) { this->in_recursion_ = 1; @@ -220,7 +220,7 @@ AST_Structure::field (AST_Field **&result, slot); } -idl_bool +bool AST_Structure::is_local (void) { if (this->local_struct_ == -1) @@ -242,7 +242,7 @@ AST_Structure::is_local (void) { if (si.item ()->is_local ()) { - this->local_struct_ = I_TRUE; + this->local_struct_ = true; break; } } @@ -290,17 +290,17 @@ AST_Structure::legal_for_primary_key (void) const si.next ()) { AST_Field *f = AST_Field::narrow_from_decl (si.item ()); - + if (f != 0 && !f->field_type ()->legal_for_primary_key ()) { retval = false; break; } } - + this->recursing_in_legal_pk_ = false; } - + return retval; } @@ -313,7 +313,7 @@ AST_Structure::fe_add_field (AST_Field *t) AST_Decl *d = 0; // Already defined and cannot be redefined? Or already used? - if ((d = this->lookup_for_add (t, I_FALSE)) != 0) + if ((d = this->lookup_for_add (t, false)) != 0) { if (!can_be_redefined (d)) { @@ -346,7 +346,7 @@ AST_Structure::fe_add_field (AST_Field *t) // Add it to set of locally referenced symbols. this->add_to_referenced (t, - I_FALSE, + false, t->local_name ()); AST_Type *ft = t->field_type (); @@ -355,7 +355,7 @@ AST_Structure::fe_add_field (AST_Field *t) if (mru != 0) { this->add_to_referenced (ft, - I_FALSE, + false, mru->first_component ()); } @@ -371,7 +371,7 @@ AST_Structure::fe_add_structure (AST_Structure *t) AST_Decl *d = 0; // Already defined and cannot be redefined? Or already used? - if ((d = this->lookup_for_add (t, I_FALSE)) != 0) + if ((d = this->lookup_for_add (t, false)) != 0) { if (!can_be_redefined (d)) { @@ -404,7 +404,7 @@ AST_Structure::fe_add_structure (AST_Structure *t) // Add it to set of locally referenced symbols. this->add_to_referenced (t, - I_FALSE, + false, t->local_name ()); return t; @@ -417,7 +417,7 @@ AST_Structure::fe_add_union (AST_Union *t) AST_Decl *d = 0; // Already defined and cannot be redefined? Or already used? - if ((d = this->lookup_for_add (t, I_FALSE)) != 0) + if ((d = this->lookup_for_add (t, false)) != 0) { if (!can_be_redefined (d)) { @@ -450,7 +450,7 @@ AST_Structure::fe_add_union (AST_Union *t) // Add it to set of locally referenced symbols. this->add_to_referenced (t, - I_FALSE, + false, t->local_name ()); return t; @@ -463,7 +463,7 @@ AST_Structure::fe_add_enum (AST_Enum *t) AST_Decl *d = 0; // Already defined and cannot be redefined? Or already used? - if ((d = this->lookup_for_add (t, I_FALSE)) != 0) + if ((d = this->lookup_for_add (t, false)) != 0) { if (!can_be_redefined (d)) { @@ -496,7 +496,7 @@ AST_Structure::fe_add_enum (AST_Enum *t) // Add it to set of locally referenced symbols. this->add_to_referenced (t, - I_FALSE, + false, t->local_name ()); return t; @@ -512,7 +512,7 @@ AST_Structure::fe_add_enum_val (AST_EnumVal *t) AST_Decl *d = 0; // Already defined and cannot be redefined? Or already used? - if ((d = this->lookup_for_add (t, I_FALSE)) != 0) + if ((d = this->lookup_for_add (t, false)) != 0) { if (!can_be_redefined (d)) { @@ -545,7 +545,7 @@ AST_Structure::fe_add_enum_val (AST_EnumVal *t) // Add it to set of locally referenced symbols. this->add_to_referenced (t, - I_FALSE, + false, t->local_name ()); return t; diff --git a/TAO/TAO_IDL/ast/ast_structure_fwd.cpp b/TAO/TAO_IDL/ast/ast_structure_fwd.cpp index 60906a704bf..9faabb96eb7 100644 --- a/TAO/TAO_IDL/ast/ast_structure_fwd.cpp +++ b/TAO/TAO_IDL/ast/ast_structure_fwd.cpp @@ -10,8 +10,8 @@ #include "ast_visitor.h" #include "utl_identifier.h" -ACE_RCSID( ast, - ast_structure_fwd, +ACE_RCSID( ast, + ast_structure_fwd, "$Id$") AST_StructureFwd::AST_StructureFwd (void) @@ -69,7 +69,7 @@ AST_StructureFwd::set_full_definition (AST_Structure *nfd) this->pd_full_definition = nfd; } -idl_bool +bool AST_StructureFwd::is_defined (void) { return (this->pd_full_definition != 0); diff --git a/TAO/TAO_IDL/ast/ast_type.cpp b/TAO/TAO_IDL/ast/ast_type.cpp index 7cdbc9b7463..ffbdb1f81ed 100644 --- a/TAO/TAO_IDL/ast/ast_type.cpp +++ b/TAO/TAO_IDL/ast/ast_type.cpp @@ -157,14 +157,14 @@ AST_Type::compute_size_type (void) return 0; } -idl_bool +bool AST_Type::in_recursion (ACE_Unbounded_Queue<AST_Type *> &) { // By default we are not involved in recursion. return 0; } -idl_bool +bool AST_Type::is_defined (void) { // AST_Interface, AST_Structure, and AST_Union will @@ -172,41 +172,41 @@ AST_Type::is_defined (void) return 1; } -idl_bool +bool AST_Type::ifr_added (void) { return this->ifr_added_; } void -AST_Type::ifr_added (idl_bool val) +AST_Type::ifr_added (bool val) { this->ifr_added_ = val; } -idl_bool +bool AST_Type::ifr_fwd_added (void) { return this->ifr_fwd_added_; } void -AST_Type::ifr_fwd_added (idl_bool val) +AST_Type::ifr_fwd_added (bool val) { this->ifr_fwd_added_ = val; } -idl_bool +bool AST_Type::has_constructor (void) { return this->has_constructor_; } void -AST_Type::has_constructor (idl_bool value) +AST_Type::has_constructor (bool value) { // Similarly to be_decl::size_type_, once this - // gets set to I_TRUE, we don't want it to + // gets set to true, we don't want it to // change back. if (this->has_constructor_ == 0) { @@ -531,7 +531,7 @@ AST_Type::nested_name (const char* local_name, return this->nested_type_name_; } -idl_bool +bool AST_Type::match_names (AST_Type *t, ACE_Unbounded_Queue<AST_Type *> &list) { for (ACE_Unbounded_Queue_Iterator<AST_Type *> iter (list); @@ -546,11 +546,11 @@ AST_Type::match_names (AST_Type *t, ACE_Unbounded_Queue<AST_Type *> &list) if (!ACE_OS::strcmp (t->full_name (), (*temp)->full_name ())) { - return I_TRUE; + return true; } } - return I_FALSE; + return false; } int diff --git a/TAO/TAO_IDL/ast/ast_typedef.cpp b/TAO/TAO_IDL/ast/ast_typedef.cpp index 25986ef56cc..e96bdcc802c 100644 --- a/TAO/TAO_IDL/ast/ast_typedef.cpp +++ b/TAO/TAO_IDL/ast/ast_typedef.cpp @@ -76,8 +76,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "ace/Log_Msg.h" -ACE_RCSID (ast, - ast_typedef, +ACE_RCSID (ast, + ast_typedef, "$Id$") AST_Typedef::AST_Typedef (void) @@ -90,8 +90,8 @@ AST_Typedef::AST_Typedef (void) AST_Typedef::AST_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, diff --git a/TAO/TAO_IDL/ast/ast_union.cpp b/TAO/TAO_IDL/ast/ast_union.cpp index d350900e71f..d94c4bfd85c 100644 --- a/TAO/TAO_IDL/ast/ast_union.cpp +++ b/TAO/TAO_IDL/ast/ast_union.cpp @@ -89,8 +89,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc. // FUZZ: disable check_for_streams_include #include "ace/streams.h" -ACE_RCSID (ast, - ast_union, +ACE_RCSID (ast, + ast_union, "$Id$") AST_Union::AST_Union (void) @@ -106,8 +106,8 @@ AST_Union::AST_Union (void) AST_Union::AST_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, @@ -240,7 +240,7 @@ AST_Union::default_index (void) } // Are we or the parameter node involved in any recursion? -idl_bool +bool AST_Union::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list) { // Proceed if the number of members in our scope is greater than 0. @@ -248,14 +248,14 @@ AST_Union::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list) { ACE_Unbounded_Queue<AST_Type *> scope_list = list; scope_list.enqueue_tail (this); - + // Initialize an iterator to iterate thru our scope. // Continue until each element is visited. for (UTL_ScopeActiveIterator si (this, UTL_Scope::IK_decls); !si.is_done (); si.next ()) { - AST_UnionBranch *field = + AST_UnionBranch *field = AST_UnionBranch::narrow_from_decl (si.item ()); if (field == 0) @@ -418,7 +418,7 @@ AST_Union::lookup_enum (AST_UnionBranch *b) // See if the symbol defines a constant in the discriminator enum. UTL_ScopedName *sn = lv->n (); d = e->lookup_by_name (sn, - I_TRUE); + true); if (d == 0 || d->defined_in () != e) { @@ -939,7 +939,7 @@ AST_Union::fe_add_union_branch (AST_UnionBranch *t) } // If branch with same field name exists, complain. - if ((d = this->lookup_for_add (t, I_FALSE)) != 0) + if ((d = this->lookup_for_add (t, false)) != 0) { if (!can_be_redefined (d)) { @@ -980,7 +980,7 @@ AST_Union::fe_add_union_branch (AST_UnionBranch *t) // Add it to set of locally referenced symbols. this->add_to_referenced (t, - I_FALSE, + false, t->local_name ()); AST_Type *ft = t->field_type (); @@ -989,10 +989,10 @@ AST_Union::fe_add_union_branch (AST_UnionBranch *t) if (mru != 0) { this->add_to_referenced (ft, - I_FALSE, + false, mru->first_component ()); } - + this->fields_.enqueue_tail (t); return t; @@ -1005,7 +1005,7 @@ AST_Union::fe_add_union (AST_Union *t) AST_Decl *d = 0; // Already defined and cannot be redefined? Or already used? - if ((d = this->lookup_for_add (t, I_FALSE)) != 0) + if ((d = this->lookup_for_add (t, false)) != 0) { if (!can_be_redefined (d)) { @@ -1038,7 +1038,7 @@ AST_Union::fe_add_union (AST_Union *t) // Add it to set of locally referenced symbols. this->add_to_referenced (t, - I_FALSE, + false, t->local_name ()); return t; @@ -1051,7 +1051,7 @@ AST_Union::fe_add_structure (AST_Structure *t) AST_Decl *d = 0; // Already defined and cannot be redefined? Or already used? - if ((d = this->lookup_for_add (t, I_FALSE)) != 0) + if ((d = this->lookup_for_add (t, false)) != 0) { if (!can_be_redefined (d)) { @@ -1084,7 +1084,7 @@ AST_Union::fe_add_structure (AST_Structure *t) // Add it to set of locally referenced symbols. this->add_to_referenced (t, - I_FALSE, + false, t->local_name ()); return t; @@ -1097,7 +1097,7 @@ AST_Union::fe_add_enum (AST_Enum *t) AST_Decl *d = 0; // Already defined and cannot be redefined? Or already used? - if ((d = this->lookup_for_add (t, I_FALSE)) != 0) + if ((d = this->lookup_for_add (t, false)) != 0) { if (!can_be_redefined (d)) { @@ -1130,7 +1130,7 @@ AST_Union::fe_add_enum (AST_Enum *t) // Add it to set of locally referenced symbols. this->add_to_referenced (t, - I_FALSE, + false, t->local_name ()); return t; @@ -1146,7 +1146,7 @@ AST_Union::fe_add_enum_val (AST_EnumVal *t) AST_Decl *d = 0; // Already defined and cannot be redefined? Or already used? - if ((d = this->lookup_for_add (t, I_FALSE)) != 0) + if ((d = this->lookup_for_add (t, false)) != 0) { if (!can_be_redefined (d)) { @@ -1179,7 +1179,7 @@ AST_Union::fe_add_enum_val (AST_EnumVal *t) // Add it to set of locally referenced symbols. this->add_to_referenced (t, - I_FALSE, + false, t->local_name ()); return t; diff --git a/TAO/TAO_IDL/ast/ast_valuebox.cpp b/TAO/TAO_IDL/ast/ast_valuebox.cpp index 7ffda49ed57..ebe7e2a2be1 100644 --- a/TAO/TAO_IDL/ast/ast_valuebox.cpp +++ b/TAO/TAO_IDL/ast/ast_valuebox.cpp @@ -20,7 +20,7 @@ AST_ValueBox::AST_ValueBox (UTL_ScopedName *n, AST_Type *boxed_type) : COMMON_Base (), AST_Decl (AST_Decl::NT_valuebox, - n, I_TRUE), + n, true), AST_Type (AST_Decl::NT_valuebox, n), AST_ConcreteType (AST_Decl::NT_valuebox, n), diff --git a/TAO/TAO_IDL/ast/ast_valuetype.cpp b/TAO/TAO_IDL/ast/ast_valuetype.cpp index 966040bc31b..d4ecbddf35b 100644 --- a/TAO/TAO_IDL/ast/ast_valuetype.cpp +++ b/TAO/TAO_IDL/ast/ast_valuetype.cpp @@ -15,8 +15,8 @@ #include "ace/streams.h" -ACE_RCSID (ast, - ast_valuetype, +ACE_RCSID (ast, + ast_valuetype, "$Id$") AST_ValueType::AST_ValueType (void) @@ -29,8 +29,8 @@ AST_ValueType::AST_ValueType (void) pd_n_supports (0), pd_inherits_concrete (0), pd_supports_concrete (0), - pd_truncatable (I_FALSE), - pd_custom (I_FALSE) + pd_truncatable (false), + pd_custom (false) { } @@ -43,10 +43,10 @@ AST_ValueType::AST_ValueType (UTL_ScopedName *n, AST_Interface **supports, long n_supports, AST_Interface *supports_concrete, - idl_bool abstract, - idl_bool truncatable, - idl_bool custom) - : COMMON_Base (I_FALSE, + bool abstract, + bool truncatable, + bool custom) + : COMMON_Base (false, abstract), AST_Decl (AST_Decl::NT_valuetype, n), @@ -58,7 +58,7 @@ AST_ValueType::AST_ValueType (UTL_ScopedName *n, n_inherits, inherits_flat, n_inherits_flat, - I_FALSE, + false, abstract), pd_supports (supports), pd_n_supports (n_supports), @@ -117,28 +117,28 @@ AST_ValueType::supports_concrete (void) const return this->pd_supports_concrete; } -idl_bool +bool AST_ValueType::truncatable (void) const { return this->pd_truncatable; } -idl_bool +bool AST_ValueType::custom (void) const { return this->pd_custom; } -idl_bool +bool AST_ValueType::will_have_factory (void) { - return I_FALSE; + return false; } // Look through supported interface list. AST_Decl * AST_ValueType::look_in_supported (UTL_ScopedName *e, - idl_bool treat_as_ref) + bool treat_as_ref) { AST_Decl *d = 0; AST_Decl *d_before = 0; @@ -214,10 +214,10 @@ AST_ValueType::legal_for_primary_key (void) const { return false; } - + bool has_public_member = false; bool retval = true; - + if (!this->recursing_in_legal_pk_) { this->recursing_in_legal_pk_ = true; @@ -228,14 +228,14 @@ AST_ValueType::legal_for_primary_key (void) const i.next ()) { AST_Field *f = AST_Field::narrow_from_decl (i.item ()); - + // We're not interested in any valuetype decls that aren't fields. if (f == 0) { continue; } - - // Private members are not allowed in primary keys. + + // Private members are not allowed in primary keys. if (f->visibility () == AST_Field::vis_PRIVATE) { retval = false; @@ -256,7 +256,7 @@ AST_ValueType::legal_for_primary_key (void) const has_public_member = true; } } - + this->recursing_in_legal_pk_ = false; } @@ -349,7 +349,7 @@ AST_ValueType::fe_add_factory (AST_Factory *f) } // Already defined and cannot be redefined? Or already used? - if ((d = this->lookup_for_add (f, I_FALSE)) != 0) + if ((d = this->lookup_for_add (f, false)) != 0) { if (!can_be_redefined (d)) { @@ -382,7 +382,7 @@ AST_ValueType::fe_add_factory (AST_Factory *f) // Add it to set of locally referenced symbols. this->add_to_referenced (f, - I_FALSE, + false, f->local_name ()); return f; @@ -401,20 +401,20 @@ AST_ValueType::derived_from_primary_key_base (const AST_ValueType *node, { return true; } - + AST_ValueType *concrete_parent = node->inherits_concrete (); - + if (this->derived_from_primary_key_base (concrete_parent, pk_base)) { return true; } - + AST_Interface **v = node->pd_inherits; - + for (long i = 0; i < node->pd_n_inherits; ++i) { AST_ValueType *tmp = AST_ValueType::narrow_from_decl (v[i]); - + if (this->derived_from_primary_key_base (tmp, pk_base)) { return true; @@ -428,17 +428,17 @@ AST_ValueType * AST_ValueType::lookup_primary_key_base (void) const { AST_ValueType *retval = idl_global->primary_key_base (); - + if (retval == 0) { Identifier local_id ("PrimaryKeyBase"); UTL_ScopedName local_name (&local_id, 0); - + Identifier scope_name ("Components"); UTL_ScopedName pk_name (&scope_name, &local_name); AST_Decl *d = - const_cast<AST_ValueType *> (this)->lookup_by_name (&pk_name, I_TRUE); - + const_cast<AST_ValueType *> (this)->lookup_by_name (&pk_name, true); + local_id.destroy (); scope_name.destroy (); @@ -455,7 +455,7 @@ AST_ValueType::lookup_primary_key_base (void) const idl_global->err ()->valuetype_expected (d); return 0; } - + idl_global->primary_key_base (retval); } diff --git a/TAO/TAO_IDL/ast/ast_valuetype_fwd.cpp b/TAO/TAO_IDL/ast/ast_valuetype_fwd.cpp index 4ddccedeeee..8f436fbcd21 100644 --- a/TAO/TAO_IDL/ast/ast_valuetype_fwd.cpp +++ b/TAO/TAO_IDL/ast/ast_valuetype_fwd.cpp @@ -5,8 +5,8 @@ #include "ast_visitor.h" #include "utl_identifier.h" -ACE_RCSID( ast, - ast_valuetype_fwd, +ACE_RCSID( ast, + ast_valuetype_fwd, "$Id$") AST_ValueTypeFwd::AST_ValueTypeFwd (void) @@ -19,7 +19,7 @@ AST_ValueTypeFwd::AST_ValueTypeFwd (void) AST_ValueTypeFwd::AST_ValueTypeFwd (AST_Interface *dummy, UTL_ScopedName *n) - : COMMON_Base (I_FALSE, + : COMMON_Base (false, dummy->is_abstract ()), AST_Decl (AST_Decl::NT_valuetype_fwd, n), 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; } diff --git a/TAO/TAO_IDL/be_include/be_array.h b/TAO/TAO_IDL/be_include/be_array.h index b9ed9ab1979..70f5f309ac0 100644 --- a/TAO/TAO_IDL/be_include/be_array.h +++ b/TAO/TAO_IDL/be_include/be_array.h @@ -39,8 +39,8 @@ public: be_array (UTL_ScopedName *n, unsigned long ndims, UTL_ExprList *dims, - idl_bool local, - idl_bool abstract); + bool local, + bool abstract); // Constructor. ~be_array (void); diff --git a/TAO/TAO_IDL/be_include/be_attribute.h b/TAO/TAO_IDL/be_include/be_attribute.h index 882ee417deb..74f245a48e6 100644 --- a/TAO/TAO_IDL/be_include/be_attribute.h +++ b/TAO/TAO_IDL/be_include/be_attribute.h @@ -36,11 +36,11 @@ public: be_attribute (void); // Default constructor. - be_attribute (idl_bool ro, + be_attribute (bool ro, AST_Type *ft, UTL_ScopedName *n, - idl_bool local, - idl_bool abstract); + bool local, + bool abstract); // Constructor. // Visiting. diff --git a/TAO/TAO_IDL/be_include/be_decl.h b/TAO/TAO_IDL/be_include/be_decl.h index e3af070c35a..0b49ae63732 100644 --- a/TAO/TAO_IDL/be_include/be_decl.h +++ b/TAO/TAO_IDL/be_include/be_decl.h @@ -70,101 +70,101 @@ public: virtual void destroy (void); // Cleanup function. - - void set_local (idl_bool val); + + void set_local (bool val); // Temporarily set this node's is_local_ flag. // Boolean methods to test if code was already generated. - idl_bool cli_hdr_gen (void); - idl_bool cli_stub_gen (void); - idl_bool cli_inline_gen (void); - idl_bool srv_hdr_gen (void); - idl_bool impl_hdr_gen (void); - idl_bool srv_skel_gen (void); - idl_bool impl_skel_gen (void); - idl_bool srv_inline_gen (void); - idl_bool cli_hdr_any_op_gen (void); - idl_bool cli_stub_any_op_gen (void); - idl_bool cli_hdr_cdr_op_gen (void); - idl_bool cli_stub_cdr_op_gen (void); - idl_bool cli_inline_cdr_op_gen (void); - idl_bool cli_inline_cdr_decl_gen (void); - idl_bool cli_hdr_serializer_op_gen (void); - idl_bool cli_stub_serializer_op_gen (void); - idl_bool cli_inline_serializer_op_gen (void); - idl_bool cli_inline_serializer_decl_gen (void); - - idl_bool cli_traits_gen (void); - idl_bool cli_arg_traits_gen (void); - idl_bool srv_arg_traits_gen (void); - idl_bool srv_sarg_traits_gen (void); - idl_bool cli_tmpl_class_gen (void); - idl_bool cli_pragma_inst_gen (void); - idl_bool cli_inarg_tmpl_class_gen (void); - idl_bool cli_inarg_pragma_inst_gen (void); - idl_bool cli_inoutarg_tmpl_class_gen (void); - idl_bool cli_inoutarg_pragma_inst_gen (void); - idl_bool cli_outarg_tmpl_class_gen (void); - idl_bool cli_outarg_pragma_inst_gen (void); - idl_bool cli_retarg_tmpl_class_gen (void); - idl_bool cli_retarg_pragma_inst_gen (void); - idl_bool srv_tmpl_class_gen (void); - idl_bool srv_pragma_inst_gen (void); - idl_bool srv_inarg_tmpl_class_gen (void); - idl_bool srv_inarg_pragma_inst_gen (void); - idl_bool srv_inoutarg_tmpl_class_gen (void); - idl_bool srv_inoutarg_pragma_inst_gen (void); - idl_bool srv_outarg_tmpl_class_gen (void); - idl_bool srv_outarg_pragma_inst_gen (void); - idl_bool srv_retarg_tmpl_class_gen (void); - idl_bool srv_retarg_pragma_inst_gen (void); - idl_bool ccm_pre_proc_gen (void); + bool cli_hdr_gen (void); + bool cli_stub_gen (void); + bool cli_inline_gen (void); + bool srv_hdr_gen (void); + bool impl_hdr_gen (void); + bool srv_skel_gen (void); + bool impl_skel_gen (void); + bool srv_inline_gen (void); + bool cli_hdr_any_op_gen (void); + bool cli_stub_any_op_gen (void); + bool cli_hdr_cdr_op_gen (void); + bool cli_stub_cdr_op_gen (void); + bool cli_inline_cdr_op_gen (void); + bool cli_inline_cdr_decl_gen (void); + bool cli_hdr_serializer_op_gen (void); + bool cli_stub_serializer_op_gen (void); + bool cli_inline_serializer_op_gen (void); + bool cli_inline_serializer_decl_gen (void); + + bool cli_traits_gen (void); + bool cli_arg_traits_gen (void); + bool srv_arg_traits_gen (void); + bool srv_sarg_traits_gen (void); + bool cli_tmpl_class_gen (void); + bool cli_pragma_inst_gen (void); + bool cli_inarg_tmpl_class_gen (void); + bool cli_inarg_pragma_inst_gen (void); + bool cli_inoutarg_tmpl_class_gen (void); + bool cli_inoutarg_pragma_inst_gen (void); + bool cli_outarg_tmpl_class_gen (void); + bool cli_outarg_pragma_inst_gen (void); + bool cli_retarg_tmpl_class_gen (void); + bool cli_retarg_pragma_inst_gen (void); + bool srv_tmpl_class_gen (void); + bool srv_pragma_inst_gen (void); + bool srv_inarg_tmpl_class_gen (void); + bool srv_inarg_pragma_inst_gen (void); + bool srv_inoutarg_tmpl_class_gen (void); + bool srv_inoutarg_pragma_inst_gen (void); + bool srv_outarg_tmpl_class_gen (void); + bool srv_outarg_pragma_inst_gen (void); + bool srv_retarg_tmpl_class_gen (void); + bool srv_retarg_pragma_inst_gen (void); + bool ccm_pre_proc_gen (void); // Set the flag indicating that code generation is done. - void cli_hdr_gen (idl_bool); - void cli_stub_gen (idl_bool); - void cli_inline_gen (idl_bool); - void srv_hdr_gen (idl_bool); - void impl_hdr_gen (idl_bool); - void srv_skel_gen (idl_bool); - void impl_skel_gen (idl_bool); - void srv_inline_gen (idl_bool); - void cli_hdr_any_op_gen (idl_bool); - void cli_stub_any_op_gen (idl_bool); - void cli_hdr_cdr_op_gen (idl_bool); - void cli_stub_cdr_op_gen (idl_bool); - void cli_inline_cdr_op_gen (idl_bool); - void cli_inline_cdr_decl_gen (idl_bool); - void cli_hdr_serializer_op_gen (idl_bool); - void cli_stub_serializer_op_gen (idl_bool); - void cli_inline_serializer_op_gen (idl_bool); - void cli_inline_serializer_decl_gen (idl_bool); - - void cli_traits_gen (idl_bool); - void cli_arg_traits_gen (idl_bool); - void srv_arg_traits_gen (idl_bool); - void srv_sarg_traits_gen (idl_bool); - void cli_tmpl_class_gen (idl_bool); - void cli_pragma_inst_gen (idl_bool); - void cli_inarg_tmpl_class_gen (idl_bool); - void cli_inarg_pragma_inst_gen (idl_bool); - void cli_inoutarg_tmpl_class_gen (idl_bool); - void cli_inoutarg_pragma_inst_gen (idl_bool); - void cli_outarg_tmpl_class_gen (idl_bool); - void cli_outarg_pragma_inst_gen (idl_bool); - void cli_retarg_tmpl_class_gen (idl_bool); - void cli_retarg_pragma_inst_gen (idl_bool); - void srv_tmpl_class_gen (idl_bool); - void srv_pragma_inst_gen (idl_bool); - void srv_inarg_tmpl_class_gen (idl_bool); - void srv_inarg_pragma_inst_gen (idl_bool); - void srv_inoutarg_tmpl_class_gen (idl_bool); - void srv_inoutarg_pragma_inst_gen (idl_bool); - void srv_outarg_tmpl_class_gen (idl_bool); - void srv_outarg_pragma_inst_gen (idl_bool); - void srv_retarg_tmpl_class_gen (idl_bool); - void srv_retarg_pragma_inst_gen (idl_bool); - void ccm_pre_proc_gen (idl_bool); + void cli_hdr_gen (bool); + void cli_stub_gen (bool); + void cli_inline_gen (bool); + void srv_hdr_gen (bool); + void impl_hdr_gen (bool); + void srv_skel_gen (bool); + void impl_skel_gen (bool); + void srv_inline_gen (bool); + void cli_hdr_any_op_gen (bool); + void cli_stub_any_op_gen (bool); + void cli_hdr_cdr_op_gen (bool); + void cli_stub_cdr_op_gen (bool); + void cli_inline_cdr_op_gen (bool); + void cli_inline_cdr_decl_gen (bool); + void cli_hdr_serializer_op_gen (bool); + void cli_stub_serializer_op_gen (bool); + void cli_inline_serializer_op_gen (bool); + void cli_inline_serializer_decl_gen (bool); + + void cli_traits_gen (bool); + void cli_arg_traits_gen (bool); + void srv_arg_traits_gen (bool); + void srv_sarg_traits_gen (bool); + void cli_tmpl_class_gen (bool); + void cli_pragma_inst_gen (bool); + void cli_inarg_tmpl_class_gen (bool); + void cli_inarg_pragma_inst_gen (bool); + void cli_inoutarg_tmpl_class_gen (bool); + void cli_inoutarg_pragma_inst_gen (bool); + void cli_outarg_tmpl_class_gen (bool); + void cli_outarg_pragma_inst_gen (bool); + void cli_retarg_tmpl_class_gen (bool); + void cli_retarg_pragma_inst_gen (bool); + void srv_tmpl_class_gen (bool); + void srv_pragma_inst_gen (bool); + void srv_inarg_tmpl_class_gen (bool); + void srv_inarg_pragma_inst_gen (bool); + void srv_inoutarg_tmpl_class_gen (bool); + void srv_inoutarg_pragma_inst_gen (bool); + void srv_outarg_tmpl_class_gen (bool); + void srv_outarg_pragma_inst_gen (bool); + void srv_retarg_tmpl_class_gen (bool); + void srv_retarg_pragma_inst_gen (bool); + void ccm_pre_proc_gen (bool); // Narrowing DEF_NARROW_METHODS1 (be_decl, AST_Decl); @@ -177,50 +177,50 @@ protected: private: // Variables that indicate if the code generation for that node is already // been done. This way we avoid regenerating same code. - idl_bool cli_hdr_gen_; - idl_bool cli_stub_gen_; - idl_bool cli_inline_gen_; - idl_bool srv_hdr_gen_; - idl_bool impl_hdr_gen_; - idl_bool srv_skel_gen_; - idl_bool impl_skel_gen_; - idl_bool srv_inline_gen_; - idl_bool cli_hdr_any_op_gen_; - idl_bool cli_stub_any_op_gen_; - idl_bool cli_hdr_cdr_op_gen_; - idl_bool cli_stub_cdr_op_gen_; - idl_bool cli_inline_cdr_op_gen_; - idl_bool cli_inline_cdr_decl_gen_; - idl_bool cli_hdr_serializer_op_gen_; - idl_bool cli_stub_serializer_op_gen_; - idl_bool cli_inline_serializer_op_gen_; - idl_bool cli_inline_serializer_decl_gen_; - - idl_bool cli_traits_gen_; - idl_bool cli_arg_traits_gen_; - idl_bool srv_arg_traits_gen_; - idl_bool srv_sarg_traits_gen_; - idl_bool cli_tmpl_class_gen_; - idl_bool cli_pragma_inst_gen_; - idl_bool cli_inarg_tmpl_class_gen_; - idl_bool cli_inarg_pragma_inst_gen_; - idl_bool cli_inoutarg_tmpl_class_gen_; - idl_bool cli_inoutarg_pragma_inst_gen_; - idl_bool cli_outarg_tmpl_class_gen_; - idl_bool cli_outarg_pragma_inst_gen_; - idl_bool cli_retarg_tmpl_class_gen_; - idl_bool cli_retarg_pragma_inst_gen_; - idl_bool srv_tmpl_class_gen_; - idl_bool srv_pragma_inst_gen_; - idl_bool srv_inarg_tmpl_class_gen_; - idl_bool srv_inarg_pragma_inst_gen_; - idl_bool srv_inoutarg_tmpl_class_gen_; - idl_bool srv_inoutarg_pragma_inst_gen_; - idl_bool srv_outarg_tmpl_class_gen_; - idl_bool srv_outarg_pragma_inst_gen_; - idl_bool srv_retarg_tmpl_class_gen_; - idl_bool srv_retarg_pragma_inst_gen_; - idl_bool ccm_pre_proc_gen_; + bool cli_hdr_gen_; + bool cli_stub_gen_; + bool cli_inline_gen_; + bool srv_hdr_gen_; + bool impl_hdr_gen_; + bool srv_skel_gen_; + bool impl_skel_gen_; + bool srv_inline_gen_; + bool cli_hdr_any_op_gen_; + bool cli_stub_any_op_gen_; + bool cli_hdr_cdr_op_gen_; + bool cli_stub_cdr_op_gen_; + bool cli_inline_cdr_op_gen_; + bool cli_inline_cdr_decl_gen_; + bool cli_hdr_serializer_op_gen_; + bool cli_stub_serializer_op_gen_; + bool cli_inline_serializer_op_gen_; + bool cli_inline_serializer_decl_gen_; + + bool cli_traits_gen_; + bool cli_arg_traits_gen_; + bool srv_arg_traits_gen_; + bool srv_sarg_traits_gen_; + bool cli_tmpl_class_gen_; + bool cli_pragma_inst_gen_; + bool cli_inarg_tmpl_class_gen_; + bool cli_inarg_pragma_inst_gen_; + bool cli_inoutarg_tmpl_class_gen_; + bool cli_inoutarg_pragma_inst_gen_; + bool cli_outarg_tmpl_class_gen_; + bool cli_outarg_pragma_inst_gen_; + bool cli_retarg_tmpl_class_gen_; + bool cli_retarg_pragma_inst_gen_; + bool srv_tmpl_class_gen_; + bool srv_pragma_inst_gen_; + bool srv_inarg_tmpl_class_gen_; + bool srv_inarg_pragma_inst_gen_; + bool srv_inoutarg_tmpl_class_gen_; + bool srv_inoutarg_pragma_inst_gen_; + bool srv_outarg_tmpl_class_gen_; + bool srv_outarg_pragma_inst_gen_; + bool srv_retarg_tmpl_class_gen_; + bool srv_retarg_pragma_inst_gen_; + bool ccm_pre_proc_gen_; }; #endif // if !defined diff --git a/TAO/TAO_IDL/be_include/be_enum.h b/TAO/TAO_IDL/be_include/be_enum.h index 99f8893dde7..97994833b64 100644 --- a/TAO/TAO_IDL/be_include/be_enum.h +++ b/TAO/TAO_IDL/be_include/be_enum.h @@ -38,8 +38,8 @@ public: // Default constructor. be_enum (UTL_ScopedName *n, - idl_bool local, - idl_bool abstract); + bool local, + bool abstract); // Constructor. virtual void destroy (void); diff --git a/TAO/TAO_IDL/be_include/be_eventtype.h b/TAO/TAO_IDL/be_include/be_eventtype.h index 2f68e756ad3..65455fa64ba 100644 --- a/TAO/TAO_IDL/be_include/be_eventtype.h +++ b/TAO/TAO_IDL/be_include/be_eventtype.h @@ -43,9 +43,9 @@ public: 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); // Constructor that sets its scoped name <n>, a list of inherited valuetypes // and supported interfaces <ih>, and the number of inherited interfaces <nih> diff --git a/TAO/TAO_IDL/be_include/be_exception.h b/TAO/TAO_IDL/be_include/be_exception.h index 1221d3be876..67657b1e54b 100644 --- a/TAO/TAO_IDL/be_include/be_exception.h +++ b/TAO/TAO_IDL/be_include/be_exception.h @@ -19,8 +19,8 @@ public: // Default constructor. be_exception (UTL_ScopedName *n, - idl_bool local, - idl_bool abstract); + bool local, + bool abstract); // Constructor. virtual void destroy (void); diff --git a/TAO/TAO_IDL/be_include/be_expression.h b/TAO/TAO_IDL/be_include/be_expression.h index b5954dc8135..405000f5649 100644 --- a/TAO/TAO_IDL/be_include/be_expression.h +++ b/TAO/TAO_IDL/be_include/be_expression.h @@ -42,8 +42,7 @@ public: be_expression (long l); - be_expression (long l, - AST_Expression::ExprType t); + be_expression (bool b); be_expression (idl_uns_long l, AST_Expression::ExprType t); diff --git a/TAO/TAO_IDL/be_include/be_generator.h b/TAO/TAO_IDL/be_include/be_generator.h index 44e39df7e0f..2a41018ac5c 100644 --- a/TAO/TAO_IDL/be_include/be_generator.h +++ b/TAO/TAO_IDL/be_include/be_generator.h @@ -95,12 +95,12 @@ public: long nih, AST_Interface **ih_flat, long nih_flat, - idl_bool local, - idl_bool abstract); + bool local, + bool abstract); virtual AST_InterfaceFwd *create_interface_fwd (UTL_ScopedName *n, - idl_bool local, - idl_bool abstract); + bool local, + bool abstract); // Create a node representing a boxed value type virtual AST_ValueBox *create_valuebox (UTL_ScopedName *n, @@ -115,12 +115,12 @@ public: 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); virtual AST_ValueTypeFwd *create_valuetype_fwd (UTL_ScopedName *n, - idl_bool abstract); + bool abstract); virtual AST_EventType *create_eventtype (UTL_ScopedName *n, AST_Interface **inherits, @@ -131,12 +131,12 @@ public: 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); virtual AST_EventTypeFwd *create_eventtype_fwd (UTL_ScopedName *n, - idl_bool abstract); + bool abstract); virtual AST_Component *create_component (UTL_ScopedName *n, AST_Component *base_component, @@ -157,24 +157,24 @@ public: long n_supports_flat); virtual AST_Exception *create_exception (UTL_ScopedName *n, - idl_bool local, - idl_bool abstract); + bool local, + bool abstract); virtual AST_Structure *create_structure (UTL_ScopedName *n, - idl_bool local, - idl_bool abstract); + bool local, + bool abstract); virtual AST_StructureFwd *create_structure_fwd (UTL_ScopedName *n); virtual AST_Enum *create_enum (UTL_ScopedName *n, - idl_bool local, - idl_bool abstract); + bool local, + bool abstract); virtual AST_Operation *create_operation (AST_Type *rt, AST_Operation::Flags fl, UTL_ScopedName *n, - idl_bool local, - idl_bool abstract); + bool local, + bool abstract); virtual AST_Field *create_field (AST_Type *ft, UTL_ScopedName *n, AST_Field::Visibility vis = @@ -184,16 +184,16 @@ public: AST_Type *ft, UTL_ScopedName *n); - virtual AST_Attribute *create_attribute (idl_bool ro, + virtual AST_Attribute *create_attribute (bool ro, AST_Type *ft, UTL_ScopedName *n, - idl_bool local, - idl_bool abstract); + bool local, + bool abstract); virtual AST_Union *create_union (AST_ConcreteType *dt, UTL_ScopedName *n, - idl_bool local, - idl_bool abstract); + bool local, + bool abstract); virtual AST_UnionFwd *create_union_fwd (UTL_ScopedName *n); @@ -241,14 +241,14 @@ public: virtual AST_Array *create_array (UTL_ScopedName *n, unsigned long ndims, UTL_ExprList *dims, - idl_bool local, - idl_bool abstract); + bool local, + bool abstract); virtual AST_Sequence *create_sequence (AST_Expression *v, AST_Type *bt, UTL_ScopedName *n, - idl_bool local, - idl_bool abstract); + bool local, + bool abstract); virtual AST_String *create_string (AST_Expression *v); @@ -256,8 +256,8 @@ public: virtual AST_Typedef *create_typedef (AST_Type *bt, UTL_ScopedName *n, - idl_bool local, - idl_bool abstract); + bool local, + bool abstract); // Create a node representing a native virtual AST_Native *create_native (UTL_ScopedName *n); diff --git a/TAO/TAO_IDL/be_include/be_global.h b/TAO/TAO_IDL/be_include/be_global.h index d312fad4d3d..cc20432939c 100644 --- a/TAO/TAO_IDL/be_include/be_global.h +++ b/TAO/TAO_IDL/be_include/be_global.h @@ -22,7 +22,7 @@ #define _BE_GLOBAL_H #include "TAO_IDL_BE_Export.h" -#include "idl_bool.h" + #include "ace/Unbounded_Queue.h" #include "ace/SString.h" @@ -339,117 +339,117 @@ public: // to be kept. Default is current directory from which the // <tao_idl> is called. - void any_support (idl_bool); + void any_support (bool); // Set any support. - idl_bool any_support (void) const; + bool any_support (void) const; // Check Any support. - void tc_support (idl_bool); + void tc_support (bool); // Set TypeCode support. - idl_bool tc_support (void) const; + bool tc_support (void) const; // Check TypeCode support - void obv_opt_accessor (idl_bool); + void obv_opt_accessor (bool); // Set optimized valuetype member accessor generation. - idl_bool obv_opt_accessor (void) const; + bool obv_opt_accessor (void) const; // Check optimized valuetype member accessor generation. - void gen_impl_files (idl_bool); + void gen_impl_files (bool); // Set generation of implementation files. - idl_bool gen_impl_files (void) const; + bool gen_impl_files (void) const; // Check if we want to generate implementation files. - void gen_impl_debug_info (idl_bool); + void gen_impl_debug_info (bool); // Set generation of source file and line number for implementation files. - idl_bool gen_impl_debug_info (void) const; + bool gen_impl_debug_info (void) const; // Check generation of source file and line number implementation files. - void gen_copy_ctor (idl_bool); + void gen_copy_ctor (bool); // Set generation of copy constructor. - idl_bool gen_copy_ctor (void) const; + bool gen_copy_ctor (void) const; // Check if we want to generate the copy constructor. - void gen_assign_op (idl_bool); + void gen_assign_op (bool); // Set the generation of the assignment operator. - idl_bool gen_assign_op (void) const; + bool gen_assign_op (void) const; // Check if we want to generate the assignment operator. - void gen_thru_poa_collocation (idl_bool); + void gen_thru_poa_collocation (bool); // Set whether we want to generate Thru_POA collocation stubs. - idl_bool gen_thru_poa_collocation (void) const; + bool gen_thru_poa_collocation (void) const; // Check if we want to generate Thru_POA collocation stubs. - void gen_direct_collocation (idl_bool); + void gen_direct_collocation (bool); // Set whether we want to generate Direct collocation stubs. - idl_bool gen_direct_collocation (void) const; + bool gen_direct_collocation (void) const; // Check if we want to generate Direct collocation stubs. - void exception_support (idl_bool); + void exception_support (bool); // Set real C++ exception support. - idl_bool exception_support (void) const; + bool exception_support (void) const; // Check if real C++ exception support is enabled. - void use_raw_throw (idl_bool); + void use_raw_throw (bool); // Set replacement of 'ACE_THROW_SPEC' with 'throw'. - idl_bool use_raw_throw (void) const; + bool use_raw_throw (void) const; // Check if raw 'throw' generation option is set. - void opt_tc (idl_bool); + void opt_tc (bool); // Set optimized typecodes. - idl_bool opt_tc (void) const; + bool opt_tc (void) const; // Check if TypeCodes are optimized. - void ami_call_back (idl_bool value); + void ami_call_back (bool value); // To enable or disable AMI call back feature of the Messaging // specification in the generated code. - idl_bool ami_call_back (void) const; + bool ami_call_back (void) const; // Return the flag. - void gen_amh_classes (idl_bool value); + void gen_amh_classes (bool value); // To enable or disable AMH in the generated code. - idl_bool gen_amh_classes (void) const; + bool gen_amh_classes (void) const; // Return the flag. - void gen_tie_classes (idl_bool value); + void gen_tie_classes (bool value); // Set the generation of tie classes and files. - idl_bool gen_tie_classes (void) const; + bool gen_tie_classes (void) const; // Return the flag. - void gen_smart_proxies (idl_bool value); + void gen_smart_proxies (bool value); // To enable or disable AMI call back feature of the Messaging // specification in the generated code. - idl_bool gen_smart_proxies (void) const; + bool gen_smart_proxies (void) const; // Return the flag. - void gen_inline_constants (idl_bool value); + void gen_inline_constants (bool value); // Set the flag. - idl_bool gen_inline_constants (void) const; + bool gen_inline_constants (void) const; // Return the flag. - void gen_dcps_type_support (idl_bool value); + void gen_dcps_type_support (bool value); // Set the flag. - idl_bool gen_dcps_type_support (void) const; + bool gen_dcps_type_support (void) const; // Return the flag. - idl_bool gen_tmplinst (void) const; + bool gen_tmplinst (void) const; // Return the flag. void lookup_strategy (LOOKUP_STRATEGY s); @@ -487,20 +487,20 @@ public: void exceptionholder (be_valuetype *val); // Accessors for the member. - idl_bool gen_anyop_files (void) const; - void gen_anyop_files (idl_bool val); + bool gen_anyop_files (void) const; + void gen_anyop_files (bool val); // Accessors for the member. - idl_bool gen_skel_files (void) const; - void gen_skel_files (idl_bool val); + bool gen_skel_files (void) const; + void gen_skel_files (bool val); // Accessors for the member gen_skel_files_. - idl_bool gen_client_inline (void) const; - void gen_client_inline (idl_bool val); + bool gen_client_inline (void) const; + void gen_client_inline (bool val); // Accessors for the member gen_client_inline_. - idl_bool gen_server_inline (void) const; - void gen_server_inline (idl_bool val); + bool gen_server_inline (void) const; + void gen_server_inline (bool val); // Accessors for the member gen_server_inline_. ACE_CString spawn_options (void); @@ -613,63 +613,63 @@ private: // kept. Default value is 0 for this string which means the current // directory from which the <tao_idl> is called. - idl_bool any_support_; + bool any_support_; // do we support Any operators? - idl_bool tc_support_; + bool tc_support_; // do we support typecodes? - idl_bool obv_opt_accessor_; + bool obv_opt_accessor_; // do we optimize valuetype accessors? - idl_bool gen_impl_files_; + bool gen_impl_files_; // are we generating implementation files? - idl_bool gen_impl_debug_info_; + bool gen_impl_debug_info_; // are we generating source file and line numbers for implementation files? - idl_bool gen_copy_ctor_; + bool gen_copy_ctor_; // are we generating the copy constructor? - idl_bool gen_assign_op_; + bool gen_assign_op_; // are we generating the assignment operator? - idl_bool gen_thru_poa_collocation_; + bool gen_thru_poa_collocation_; // are we generating Thru_POA collocated stubs? - idl_bool gen_direct_collocation_; + bool gen_direct_collocation_; // are we generating Direct collocated stubs? - idl_bool exception_support_; + bool exception_support_; // do we support real C++ exceptions (strict mapping) for stubs/skeletons? - idl_bool use_raw_throw_; + bool use_raw_throw_; // Another possible option if the above is TRUE. - idl_bool opt_tc_; + bool opt_tc_; // do we generate optimized typecodes? - idl_bool ami_call_back_; + bool ami_call_back_; // Flag to indicate whether the AMI Call back feature of the // Messaging specification should be enabled for the generated files // or not. - idl_bool gen_amh_classes_; + bool gen_amh_classes_; // Flag for generating AMH classes. - idl_bool gen_tie_classes_; + bool gen_tie_classes_; // Flag to indicate whether we generate the tie classes and // files or not. - idl_bool gen_smart_proxies_; + bool gen_smart_proxies_; // Flag to indicate whether smart proxies classes will be generated // or not. - idl_bool gen_inline_constants_; + bool gen_inline_constants_; // Flag to indicate whether we are using an inline form of constant // generation that pleases the C++ compiler better on some platforms. - idl_bool gen_dcps_type_support_; + bool gen_dcps_type_support_; // Flag to indicate whether we are supporting DDS DCPS type definitions. // Includes Serializer operators (like TAO_Input/OutuptCDR). @@ -685,18 +685,18 @@ private: be_valuetype *exceptionholder_; // Reference holder for the exceptionholder. - idl_bool gen_anyop_files_; + bool gen_anyop_files_; // Separate files for generated Any operators? - idl_bool gen_skel_files_; + bool gen_skel_files_; // True by default, but a command line option can turn this off so // we generate only an empty *S.h file on the skeleton side. - idl_bool gen_client_inline_; + bool gen_client_inline_; // True by default, but a command line option can turn this off so // that we don't generate a client inline file - idl_bool gen_server_inline_; + bool gen_server_inline_; // True by default, but a command line option can turn this off so // that we don't generate a server inline file }; diff --git a/TAO/TAO_IDL/be_include/be_helper.h b/TAO/TAO_IDL/be_include/be_helper.h index 9823766e2a1..95cc6bf2b72 100644 --- a/TAO/TAO_IDL/be_include/be_helper.h +++ b/TAO/TAO_IDL/be_include/be_helper.h @@ -29,11 +29,10 @@ class Identifier; class UTL_IdList; class AST_Expression; -// a dummy structure to inform TAO_OutStream's << operator to put a newline +// A dummy structure to inform TAO_OutStream's << operator to put a newline // and use the current indentation for the succeeding line struct TAO_NL { -public: TAO_NL (void); }; @@ -71,6 +70,58 @@ extern const TAO_INDENT be_idt_nl; extern const TAO_UNINDENT be_uidt; extern const TAO_UNINDENT be_uidt_nl; +// A structure to inform TAO_OutStream's << operator to +// conditionally output a newline and some form of "ACE_ENV_*". +struct TAO_ENV_ARG +{ + TAO_ENV_ARG (bool with_defaults = false, + bool single = false, + bool arg = false, + bool not_used = false); + + bool with_defaults_; + bool single_; + bool arg_; + bool not_used_; +}; + +extern const TAO_ENV_ARG env_decl; +extern const TAO_ENV_ARG env_dflts; +extern const TAO_ENV_ARG env_sngl; +extern const TAO_ENV_ARG env_sngl_dflts; +extern const TAO_ENV_ARG env_not; +extern const TAO_ENV_ARG env_sngl_not; +extern const TAO_ENV_ARG env_arg; +extern const TAO_ENV_ARG env_sngl_arg; + +// A structure to inform TAO_OutStream's << operator to +// conditionally output a newline and some form of "ACE_CHECK". +struct TAO_ACE_CHECK +{ + TAO_ACE_CHECK (const char *retval = 0, + bool do_return = false); + + const char *retval_; + bool do_return_; +}; + +// A dummy structure to inform TAO_OutStream's << operator to +// conditionally output a newline and "ACE_TRY_CHECK". +struct TAO_ACE_TRY_CHECK +{ + TAO_ACE_TRY_CHECK (void); +}; + +// A structure to inform TAO_OutStream's << operator to +// conditionally output a newline and "ACE_ENDTRY. +struct TAO_ACE_ENDTRY +{ + TAO_ACE_ENDTRY (void); +}; + +extern const TAO_ACE_TRY_CHECK ace_try_check; +extern const TAO_ACE_ENDTRY ace_endtry; + class TAO_OutStream { // =TITLE @@ -185,6 +236,18 @@ public: TAO_OutStream &operator<< (const TAO_INDENT& i); TAO_OutStream &operator<< (const TAO_UNINDENT& i); + TAO_OutStream &operator<< (const TAO_ENV_ARG& i); + // Conditional and generic output for all forms of "ACE_ENV_*". + + TAO_OutStream &operator<< (TAO_ACE_CHECK& i); + // Conditional and generic output for all forms of "ACE_CHECK". + + TAO_OutStream &operator<< (const TAO_ACE_TRY_CHECK& i); + // Conditional and generic output for all forms of "ACE_ENV_*". + + TAO_OutStream &operator<< (const TAO_ACE_ENDTRY& i); + // Conditional and generic output for all forms of "ACE_CHECK". + // The following will be provided by specialized classes TAO_OutStream &operator<< (Identifier *id); diff --git a/TAO/TAO_IDL/be_include/be_interface.h b/TAO/TAO_IDL/be_include/be_interface.h index 90bebac52b2..c4af6c6d1c4 100644 --- a/TAO/TAO_IDL/be_include/be_interface.h +++ b/TAO/TAO_IDL/be_include/be_interface.h @@ -66,8 +66,8 @@ public: long nih, AST_Interface **ih_flat, long nih_flat, - idl_bool local, - idl_bool abstract); + bool local, + bool abstract); // Constructor that sets its scoped name <n>, a list of inherited interfaces // <ih>, the number of inherited interfaces <nih>, and any prgmas <p>. @@ -188,7 +188,7 @@ public: int traverse_inheritance_graph ( TAO_IDL_Inheritance_Hierarchy_Worker &worker, TAO_OutStream *os, - idl_bool abstract_paths_only = I_FALSE + bool abstract_paths_only = false ); /// Wrap the @c gen parameter and call the generic version of @@ -196,7 +196,7 @@ public: int traverse_inheritance_graph ( tao_code_emitter gen, TAO_OutStream *os, - idl_bool abstract_paths_only = I_FALSE + bool abstract_paths_only = false ); int in_mult_inheritance (void); @@ -294,7 +294,7 @@ public: be_interface *ancestor, AST_Decl *d, const char *prefix, - idl_bool direct, + bool direct, UTL_ExceptList *list, TAO_OutStream *os); // Common code called from gen_colloc_op_defn_helper(). @@ -329,8 +329,8 @@ public: int session_component_child (void); // Is Components::SessionComponent an immediate parent? - - idl_bool is_event_consumer (void); + + bool is_event_consumer (void); // Is EventConsumerBase our parent? private: diff --git a/TAO/TAO_IDL/be_include/be_interface_fwd.h b/TAO/TAO_IDL/be_include/be_interface_fwd.h index 6c2d84f7614..1c15e862428 100644 --- a/TAO/TAO_IDL/be_include/be_interface_fwd.h +++ b/TAO/TAO_IDL/be_include/be_interface_fwd.h @@ -48,9 +48,9 @@ public: virtual ~be_interface_fwd (void); // Destructor. - virtual void seq_elem_tmplinst (idl_bool val); - virtual void seen_in_sequence (idl_bool val); - virtual void seen_in_operation (idl_bool val); + virtual void seq_elem_tmplinst (bool val); + virtual void seen_in_sequence (bool val); + virtual void seen_in_operation (bool val); // Mutator overrides for be_type members. If we have been // defined, we want the full definition to be set as well. diff --git a/TAO/TAO_IDL/be_include/be_operation.h b/TAO/TAO_IDL/be_include/be_operation.h index 0e004b3b682..49b837e3467 100644 --- a/TAO/TAO_IDL/be_include/be_operation.h +++ b/TAO/TAO_IDL/be_include/be_operation.h @@ -43,8 +43,8 @@ public: be_operation (AST_Type *rt, AST_Operation::Flags fl, UTL_ScopedName *n, - idl_bool local, - idl_bool abstract); + bool local, + bool abstract); // Constructor ~be_operation (void); diff --git a/TAO/TAO_IDL/be_include/be_sequence.h b/TAO/TAO_IDL/be_include/be_sequence.h index f6ae364d559..8a4f21fb3d9 100644 --- a/TAO/TAO_IDL/be_include/be_sequence.h +++ b/TAO/TAO_IDL/be_include/be_sequence.h @@ -61,8 +61,8 @@ public: be_sequence (AST_Expression *v, AST_Type *bt, UTL_ScopedName *n, - idl_bool local, - idl_bool abstract); + bool local, + bool abstract); // Constructor. virtual int create_name (be_typedef *node); diff --git a/TAO/TAO_IDL/be_include/be_structure.h b/TAO/TAO_IDL/be_include/be_structure.h index 6a48bd892f7..61e5646d95a 100644 --- a/TAO/TAO_IDL/be_include/be_structure.h +++ b/TAO/TAO_IDL/be_include/be_structure.h @@ -38,8 +38,8 @@ public: // Default constructor. be_structure (UTL_ScopedName *n, - idl_bool local, - idl_bool abstract); + bool local, + bool abstract); // Constructor. virtual void redefine (AST_Structure *from); diff --git a/TAO/TAO_IDL/be_include/be_type.h b/TAO/TAO_IDL/be_include/be_type.h index 17dd1ee6984..4f4faf15d71 100644 --- a/TAO/TAO_IDL/be_include/be_type.h +++ b/TAO/TAO_IDL/be_include/be_type.h @@ -63,16 +63,16 @@ public: void gen_common_varout (TAO_OutStream *os); // Generate _var and _out typedefs for structs and unions. - idl_bool seq_elem_tmplinst (void) const; - virtual void seq_elem_tmplinst (idl_bool val); + bool seq_elem_tmplinst (void) const; + virtual void seq_elem_tmplinst (bool val); // Accessors for the member. - idl_bool seen_in_sequence (void) const; - virtual void seen_in_sequence (idl_bool val); + bool seen_in_sequence (void) const; + virtual void seen_in_sequence (bool val); // Accessors for the member. - idl_bool seen_in_operation (void) const; - virtual void seen_in_operation (idl_bool val); + bool seen_in_operation (void) const; + virtual void seen_in_operation (bool val); // Accessors for the member. virtual AST_Decl::NodeType base_node_type (void) const; @@ -101,17 +101,17 @@ protected: ACE_CString fwd_helper_name_; // Used by interfaces, valuetypes and arrays to name helper structs. - idl_bool common_varout_gen_; + bool common_varout_gen_; // Have we generated our _var and _out class typedefs yet? - idl_bool seq_elem_tmplinst_; + bool seq_elem_tmplinst_; // Have we generated an explicit template instantiation for a sequence // with this element? - idl_bool seen_in_sequence_; + bool seen_in_sequence_; // Has this declaration been used as a sequence element? - idl_bool seen_in_operation_; + bool seen_in_operation_; // Has this declaration been used as a return type or parameter? }; diff --git a/TAO/TAO_IDL/be_include/be_typedef.h b/TAO/TAO_IDL/be_include/be_typedef.h index 94af3381b5f..4f5f1b69591 100644 --- a/TAO/TAO_IDL/be_include/be_typedef.h +++ b/TAO/TAO_IDL/be_include/be_typedef.h @@ -36,13 +36,13 @@ public: be_typedef (AST_Type *bt, UTL_ScopedName *n, - idl_bool l, - idl_bool a); + bool l, + bool a); // Constructor. - virtual void seq_elem_tmplinst (idl_bool val); - virtual void seen_in_sequence (idl_bool val); - virtual void seen_in_operation (idl_bool val); + virtual void seq_elem_tmplinst (bool val); + virtual void seen_in_sequence (bool val); + virtual void seen_in_operation (bool val); // Mutator overrides for be_type members. If we have been // defined, we want the underlying type to be set as well. diff --git a/TAO/TAO_IDL/be_include/be_union.h b/TAO/TAO_IDL/be_include/be_union.h index e5564f38d7a..7ebe974875a 100644 --- a/TAO/TAO_IDL/be_include/be_union.h +++ b/TAO/TAO_IDL/be_include/be_union.h @@ -39,14 +39,14 @@ public: be_union (AST_ConcreteType *dt, UTL_ScopedName *n, - idl_bool local, - idl_bool abstract); + bool local, + bool abstract); // Constructor. virtual void redefine (AST_Structure *from); // Catch BE-specific member values before delegating to the base class. - virtual idl_bool has_duplicate_case_labels (void); + virtual bool has_duplicate_case_labels (void); // Do we have at least one member with multiple case labels? virtual void destroy (void); @@ -55,10 +55,10 @@ public: virtual int accept (be_visitor *visitor); // Visiting. - idl_bool gen_empty_default_label (void); + bool gen_empty_default_label (void); // Decides whether a default switch case label in the generated copy // constructor, assignment operator, etc. is needed. - + unsigned long nlabels (void); // Returns total number of labels, useful when the union has // multiple case labels. diff --git a/TAO/TAO_IDL/be_include/be_valuetype.h b/TAO/TAO_IDL/be_include/be_valuetype.h index 20ddb721b4f..9acbfe5ebb7 100644 --- a/TAO/TAO_IDL/be_include/be_valuetype.h +++ b/TAO/TAO_IDL/be_include/be_valuetype.h @@ -47,9 +47,9 @@ public: 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); // Constructor that sets its scoped name <n>, a list of inherited valuetypes // and supported interfaces <ih>, and the number of inherited interfaces <nih> @@ -58,7 +58,7 @@ public: virtual void redefine (AST_Interface *from); - idl_bool opt_accessor (void); + bool opt_accessor (void); // Should generate optimized form? virtual int gen_helper_header (char *local_name = 0, @@ -72,7 +72,7 @@ public: virtual int gen_helper_stubs (char *local_name = 0, char *full_name = 0); // Generate the helper functions implementation. - + void gen_var_out_seq_decls (void); // Generate the declarations used by the template _var, _out // classes for valuetypes, and by sequence template classes. @@ -92,8 +92,8 @@ public: int traverse_supports_list_graphs ( tao_code_emitter gen, TAO_OutStream *os, - idl_bool use_abstract_paths = I_TRUE, - idl_bool use_concrete_paths = I_TRUE + bool use_abstract_paths = true, + bool use_concrete_paths = true ); /// Load the insert queue with the concrete interface we support, and @@ -103,7 +103,7 @@ public: TAO_OutStream *os ); - idl_bool supports_abstract (void) const; + bool supports_abstract (void) const; // Do we support at least one abstract interface? // Visiting. @@ -125,7 +125,7 @@ public: ); // Compute the count of private/public/all data members. - virtual idl_bool in_recursion (ACE_Unbounded_Queue<AST_Type *> &list); + virtual bool in_recursion (ACE_Unbounded_Queue<AST_Type *> &list); // Check if we are in recursion. static int abstract_supports_helper (be_interface *node, @@ -166,24 +166,24 @@ public: FactoryStyle determine_factory_style (void); // Determine what kind of factory needed. - idl_bool have_operation (void); + bool have_operation (void); // Recurse down the inheritance tree to determine // if valuetype has at least one operation/attribute. - static idl_bool have_supported_op (be_interface *node); + static bool have_supported_op (be_interface *node); // Check if VT supports an interface with at least 1 operation. - virtual idl_bool will_have_factory (void); + virtual bool will_have_factory (void); // Use the above enum and methods to determine this after the // node's scope is visited but before code generation. - + bool has_member (void); // Decides whether to generate the initializing contstructor or not. - + private: char *full_obv_skel_name_; - idl_bool supports_abstract_; + bool supports_abstract_; // Do we support at least one abstract interface? int var_out_seq_decls_gen_; diff --git a/TAO/TAO_IDL/be_include/be_visitor_arg_traits.h b/TAO/TAO_IDL/be_include/be_visitor_arg_traits.h index 9a5ef1055fc..8246fc5d7c4 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_arg_traits.h +++ b/TAO/TAO_IDL/be_include/be_visitor_arg_traits.h @@ -77,9 +77,9 @@ public: private: - idl_bool generated (be_decl *node) const; + bool generated (be_decl *node) const; void generated (be_decl *node, - idl_bool val); + bool val); const char *insert_policy (void); diff --git a/TAO/TAO_IDL/be_include/be_visitor_context.h b/TAO/TAO_IDL/be_include/be_visitor_context.h index 292f18a3bbc..c2837eaec91 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_context.h +++ b/TAO/TAO_IDL/be_include/be_visitor_context.h @@ -27,7 +27,7 @@ #define TAO_BE_VISITOR_CONTEXT_H #include "be_codegen.h" -#include "idl_bool.h" + class TAO_OutStream; class be_decl; @@ -128,16 +128,16 @@ public: be_attribute *attribute (void); // get the attribute node - void exception (idl_bool); + void exception (bool); // is it the special ctor for exceptions? - idl_bool exception (void); + bool exception (void); // is it the special ctor for exceptions? - void comma (idl_bool); + void comma (bool); // scope supoorts generation of comma after each element - idl_bool comma (void); + bool comma (void); // are we supposed to generate a comma? be_interface *interface (void) const; @@ -243,10 +243,10 @@ public: be_union *be_scope_as_union (void); // return the scope as union if possible - + const char *export_macro (void) const; // return the export macro currently in force - + const char *non_null_export_macro (void) const; // if anyop export macro is empty, check stub. @@ -275,10 +275,10 @@ private: be_attribute *attr_; // attribute node stored here while generating its code - idl_bool exception_; + bool exception_; // is it the special ctor for exceptions? - idl_bool comma_; + bool comma_; // whether scope should generate a comma after every element be_interface* interface_; @@ -288,5 +288,5 @@ private: #if defined (interface) # define interface aceinterface #endif /* interface */ - + #endif /* BE_VISITOR_CONTEXT_H */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/operation.h b/TAO/TAO_IDL/be_include/be_visitor_operation/operation.h index 6142a9c9ab9..062923f54cd 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/operation.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/operation.h @@ -74,13 +74,6 @@ public: const char *exception_arguments); // helper that generates code for raising an exception - virtual int gen_check_exception (be_type *return_type); - // helper that generates code for checking for an exception - - virtual int gen_check_interceptor_exception (be_type *); - // helper that generates code for checking for an exception within - // an interceptor try block. - virtual int gen_stub_operation_body (be_operation *node, be_type *return_type); // Generates the code from opening brace to closing brace for @@ -102,7 +95,7 @@ public: void gen_stub_body_arglist (be_operation *node, TAO_OutStream *os, - idl_bool ami = I_FALSE); + bool ami = false); void gen_arg_template_param_name (AST_Decl *scope, AST_Type *bt, diff --git a/TAO/TAO_IDL/be_include/be_visitor_scope.h b/TAO/TAO_IDL/be_include/be_visitor_scope.h index 6aa0a2be7b6..061aa2c158f 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_scope.h +++ b/TAO/TAO_IDL/be_include/be_visitor_scope.h @@ -22,7 +22,7 @@ #define TAO_BE_VISITOR_SCOPE_H #include "be_visitor_decl.h" -#include "idl_bool.h" + class be_visitor_scope : public be_visitor_decl { @@ -57,10 +57,10 @@ public: virtual int next_elem (be_decl *elem, be_decl *&); // get the successor to elem - virtual idl_bool last_node (be_decl *bd); + virtual bool last_node (be_decl *bd); // Is bd the last node in the scope - idl_bool last_inout_or_out_node (be_decl *bd); + bool last_inout_or_out_node (be_decl *bd); // Is bd the last inout or out in the scope protected: diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/arglist.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/arglist.h index 229f6a2252c..d407c637573 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/arglist.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/arglist.h @@ -41,7 +41,7 @@ public: ~be_visitor_obv_operation_arglist (void); // destructor - idl_bool is_amh_exception_holder (be_operation *node); + bool is_amh_exception_holder (be_operation *node); // special arglist generation for amh_exceptionholders int visit_operation (be_operation *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ci.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ci.h index fe0e43b1909..4803e64cfee 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ci.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ci.h @@ -62,8 +62,8 @@ public: void op_name (be_valuetype *node, TAO_OutStream *os); // if (in_obv_space_) print OBV_name else print name - idl_bool in_obv_space_; - + bool in_obv_space_; + private: const char *pre_op_; }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cs.h index 1699deef3d9..b8ce769a27b 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cs.h @@ -93,7 +93,7 @@ public: void op_name (be_valuetype *node, TAO_OutStream *os); // if (in_obv_space_) print OBV_name else print name - idl_bool in_obv_space_; + bool in_obv_space_; private: const char *pre_op_; diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype.h index a0ccc9cd6fb..e88c4509dfb 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype.h @@ -100,17 +100,17 @@ public: void gen_obv_init_constructor_args (be_valuetype *node, unsigned long &index); // Recursively generate args for the initializing constuctor. - + protected: - static idl_bool obv_need_ref_counter (be_valuetype *node); + static bool obv_need_ref_counter (be_valuetype *node); // check is VT needs a RefCounter mix-in in OBV_ class // suppose that we are deciding for this node - static idl_bool obv_have_ref_counter (be_valuetype *node); + static bool obv_have_ref_counter (be_valuetype *node); // recurse down the inheritance tree to see // if node or one of its OBV_ base class already has RefCounter - idl_bool is_amh_exception_holder (be_valuetype *node); + bool is_amh_exception_holder (be_valuetype *node); // Predicate common to _ch and _cs visitors. }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ci.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ci.h index d3960113f7e..08d463d53f7 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ci.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ci.h @@ -45,7 +45,7 @@ public: virtual int visit_field (be_field *node); private: - idl_bool opt_accessor_; + bool opt_accessor_; }; #endif /* _BE_VALUETYPE_VALUETYPE_CI_H_ */ diff --git a/TAO/TAO_IDL/driver/drv_args.cpp b/TAO/TAO_IDL/driver/drv_args.cpp index 596c0f2fbe7..aef8a8394f0 100644 --- a/TAO/TAO_IDL/driver/drv_args.cpp +++ b/TAO/TAO_IDL/driver/drv_args.cpp @@ -193,7 +193,7 @@ DRV_usage (void) LM_DEBUG, ACE_TEXT (" -Yp,path\t\tdefines location of preprocessor\n") )); - + be_global->usage (); } @@ -276,16 +276,16 @@ DRV_parse_args (long ac, char **av) if (i < ac - 1) { idl_global->append_idl_flag (av[i + 1]); - + has_space = idl_global->hasspace (av[i + 1]); - + // If the include path has a space, we need to // add literal "s. ACE_CString arg = av[i]; arg += (has_space ? "\"" : ""); arg += av[i + 1]; arg += (has_space ? "\"" : ""); - + DRV_cpp_putarg (arg.c_str ()); idl_global->add_include_path (arg.substr (2).c_str ()); i++; @@ -305,14 +305,14 @@ DRV_parse_args (long ac, char **av) else { has_space = idl_global->hasspace (av[i]); - + // If the include path has a space, we need to // add literal "s. ACE_CString arg (av[i], 2); arg += (has_space ? "\"" : ""); arg += av[i] + 2; arg += (has_space? "\"" : ""); - + idl_global->add_include_path (arg.substr (2).c_str ()); DRV_cpp_putarg (arg.c_str ()); } @@ -431,12 +431,12 @@ DRV_parse_args (long ac, char **av) if (av[i][2] == 'e') { // ...report an error. - idl_global->case_diff_error (I_TRUE); + idl_global->case_diff_error (true); } else if (av[i][2] == 'w') { // ...report a warning (default for now) - idl_global->case_diff_error (I_FALSE); + idl_global->case_diff_error (false); } else { @@ -513,6 +513,6 @@ DRV_parse_args (long ac, char **av) idl_global->temp_dir (tmpdir); } - + DRV_cpp_post_init (); } diff --git a/TAO/TAO_IDL/driver/drv_preproc.cpp b/TAO/TAO_IDL/driver/drv_preproc.cpp index 73347fe82bd..36d8bbc09ed 100644 --- a/TAO/TAO_IDL/driver/drv_preproc.cpp +++ b/TAO/TAO_IDL/driver/drv_preproc.cpp @@ -66,7 +66,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc. // Pass an IDL file through the C preprocessor -#include "idl_bool.h" + #include "idl_defines.h" #include "global_extern.h" #include "fe_extern.h" @@ -169,17 +169,17 @@ DRV_get_line (FILE *f) if (l == 0) { - return I_FALSE; + return false; } if (*l == '\0' && feof (f)) { - return I_FALSE; + return false; } if (*l == '\0') { - return I_TRUE; + return true; } i = strlen(l) - 1; @@ -189,7 +189,7 @@ DRV_get_line (FILE *f) l[i] = '\0'; } - return I_TRUE; + return true; } // Initialize the cpp argument list. @@ -283,8 +283,6 @@ DRV_cpp_init (void) // TAO_IDL_INCLUDE_DIR should be in quotes, // e.g. "/usr/local/include/tao" ACE_OS::strcat (option1, TAO_IDL_INCLUDE_DIR); - ACE_OS::strcat (option2, TAO_IDL_INCLUDE_DIR); - ACE_OS::strcat (option2, "/tao"); #else ACE_ERROR ((LM_WARNING, "NOTE: The environment variables " @@ -293,16 +291,17 @@ DRV_cpp_init (void) "locate orb.idl\n")); ACE_OS::strcat (option1, "."); - ACE_OS::strcat (option2, "."); #endif /* TAO_IDL_INCLUDE_DIR */ } } DRV_cpp_putarg (option1); - DRV_cpp_putarg (option2); idl_global->add_include_path (ACE_CString (option1 + 2).c_str ()); - idl_global->add_include_path (ACE_CString (option2 + 2).c_str ()); idl_global->tao_root (option1 + 2); +#if !defined (TAO_IDL_INCLUDE_DIR) + DRV_cpp_putarg (option2); + idl_global->add_include_path (ACE_CString (option2 + 2).c_str ()); +#endif /* TAO_IDL_INCLUDE_DIR */ } // Add any flags in cpp_args to cpp's arglist. diff --git a/TAO/TAO_IDL/fe/fe_init.cpp b/TAO/TAO_IDL/fe/fe_init.cpp index e0128cb30cd..3dff54991bd 100644 --- a/TAO/TAO_IDL/fe/fe_init.cpp +++ b/TAO/TAO_IDL/fe/fe_init.cpp @@ -613,8 +613,8 @@ FE_init (void) idl_global->set_main_filename (0); idl_global->set_real_filename (0); idl_global->set_stripped_filename (0); - idl_global->set_import (I_TRUE); - idl_global->set_in_main_file (I_FALSE); + idl_global->set_import (true); + idl_global->set_in_main_file (false); idl_global->set_lineno (-1); idl_global->set_prog_name (0); @@ -628,7 +628,7 @@ FE_init (void) idl_global->set_include_file_names (0); idl_global->set_n_include_file_names (0); idl_global->set_parse_state (IDL_GlobalData::PS_NoState); - idl_global->preserve_cpp_keywords (I_FALSE); + idl_global->preserve_cpp_keywords (false); // Put an empty prefix on the stack for the global scope. idl_global->pragma_prefixes ().push (ACE::strnew ("")); @@ -673,7 +673,7 @@ FE_populate (void) fe_populate_global_scope (idl_global->root ()); // Set flag to indicate we are processing the main file now. - idl_global->set_in_main_file (I_TRUE); + idl_global->set_in_main_file (true); // Populate the IDL keyword container, for checking local identifiers. fe_populate_idl_keywords (); diff --git a/TAO/TAO_IDL/fe/fe_interface_header.cpp b/TAO/TAO_IDL/fe/fe_interface_header.cpp index acbd93e3078..3a7ec741ad8 100644 --- a/TAO/TAO_IDL/fe/fe_interface_header.cpp +++ b/TAO/TAO_IDL/fe/fe_interface_header.cpp @@ -78,8 +78,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "global_extern.h" #include "nr_extern.h" -ACE_RCSID (fe, - fe_interface_header, +ACE_RCSID (fe, + fe_interface_header, "$Id$") #undef INCREMENT @@ -179,11 +179,11 @@ already_seen (AST_Interface *ip) { if (iseen[i] == ip) { - return I_TRUE; + return true; } } - return I_FALSE; + return false; } // Have we already seen this interface in the flat list? @@ -194,11 +194,11 @@ already_seen_flat (AST_Interface *ip) { if (iseen_flat[i] == ip) { - return I_TRUE; + return true; } } - return I_FALSE; + return false; } // @@@ (JP) Here are the rules for interface inheritance and @@ -231,14 +231,14 @@ interface, a derived valuetype may also be declared to support an interface, as long as it is derived from all interfaces that are supported by any base valuetypes. Here is an example: -interface I1 { }; -interface I2 { }; -interface I3: I1, I2 { }; +interface I1 { }; +interface I2 { }; +interface I3: I1, I2 { }; -abstract valuetype V1 supports I1 { }; -abstract valuetype V2 supports I2 { }; -valuetype V3: V1, V2 supports I3 { }; // legal -valuetype V4: V1 supports I2 { }; // illegal +abstract valuetype V1 supports I1 { }; +abstract valuetype V2 supports I2 { }; +valuetype V3: V1, V2 supports I3 { }; // legal +valuetype V4: V1 supports I2 { }; // illegal This last rule was made to guarantee that any given valuetype supported at most one most-derived interface. We didn't want valuetypes to extend @@ -248,9 +248,9 @@ interfaces. FE_InterfaceHeader::FE_InterfaceHeader (UTL_ScopedName *n, UTL_NameList *inherits, - idl_bool is_local, - idl_bool is_abstract, - idl_bool compile_now) + bool is_local, + bool is_abstract, + bool compile_now) : pd_interface_name (n), pd_inherits (0), pd_n_inherits (0), @@ -262,7 +262,7 @@ FE_InterfaceHeader::FE_InterfaceHeader (UTL_ScopedName *n, if (compile_now) { this->compile_inheritance (inherits, - I_FALSE); + false); } } @@ -270,13 +270,13 @@ FE_InterfaceHeader::~FE_InterfaceHeader (void) { } -idl_bool +bool FE_InterfaceHeader::is_local (void) const { return this->pd_is_local; } -idl_bool +bool FE_InterfaceHeader::is_abstract (void) const { return this->pd_is_abstract; @@ -289,7 +289,7 @@ FE_InterfaceHeader::destroy (void) { return; } - + this->pd_interface_name->destroy (); delete this->pd_interface_name; this->pd_interface_name = 0; @@ -340,7 +340,7 @@ FE_InterfaceHeader::compile_one_inheritance (AST_Interface *i) // Compute the list of top-level interfaces this one inherits from. void FE_InterfaceHeader::compile_inheritance (UTL_NameList *ifaces, - idl_bool for_valuetype) + bool for_valuetype) { if (ifaces == 0) { @@ -368,7 +368,7 @@ FE_InterfaceHeader::compile_inheritance (UTL_NameList *ifaces, if (idl_global->scopes ().top () == 0) { idl_global->err ()->lookup_error (item); - + // This is probably the result of bad IDL. // We will crash if we continue from here. exit (99); @@ -378,7 +378,7 @@ FE_InterfaceHeader::compile_inheritance (UTL_NameList *ifaces, UTL_Scope *s = idl_global->scopes ().top (); d = s->lookup_by_name (item, - I_TRUE); + true); if (d == 0) { @@ -396,7 +396,7 @@ FE_InterfaceHeader::compile_inheritance (UTL_NameList *ifaces, if (d == 0) { idl_global->err ()->lookup_error (item); - + // This is probably the result of bad IDL. // We will crash if we continue from here. exit (99); @@ -477,11 +477,11 @@ FE_InterfaceHeader::compile_inheritance (UTL_NameList *ifaces, int FE_InterfaceHeader::check_inherit (AST_Interface *i, - idl_bool for_valuetype) + bool for_valuetype) { // We use the narrow instead of node_type() here so we can get a // match with both valuetypes and eventtypes. - idl_bool is_valuetype = (AST_ValueType::narrow_from_decl (i) != 0); + bool is_valuetype = (AST_ValueType::narrow_from_decl (i) != 0); if ( // Non-local interfaces may not inherit from local ones. @@ -535,13 +535,13 @@ FE_InterfaceHeader::n_inherits_flat (void) const FE_OBVHeader::FE_OBVHeader (UTL_ScopedName *n, UTL_NameList *inherits, UTL_NameList *supports, - idl_bool truncatable, - idl_bool is_eventtype) + bool truncatable, + bool is_eventtype) : FE_InterfaceHeader (n, inherits, - I_FALSE, - I_FALSE, - I_FALSE), + false, + false, + false), pd_supports (0), pd_inherits_concrete (0), pd_supports_concrete (0), @@ -584,7 +584,7 @@ FE_OBVHeader::supports_concrete (void) const return this->pd_supports_concrete; } -idl_bool +bool FE_OBVHeader::truncatable (void) const { return this->pd_truncatable; @@ -592,10 +592,10 @@ FE_OBVHeader::truncatable (void) const void FE_OBVHeader::compile_inheritance (UTL_NameList *vtypes, - idl_bool is_eventtype) + bool is_eventtype) { this->FE_InterfaceHeader::compile_inheritance (vtypes, - I_TRUE); + true); if (this->pd_n_inherits > 0) { @@ -603,7 +603,7 @@ FE_OBVHeader::compile_inheritance (UTL_NameList *vtypes, AST_ValueType *vt = AST_ValueType::narrow_from_decl (iface); if (vt != 0 - && vt->is_abstract () == I_FALSE) + && vt->is_abstract () == false) { this->pd_inherits_concrete = vt; } @@ -660,7 +660,7 @@ FE_OBVHeader::compile_supports (UTL_NameList *supports) if (idl_global->scopes ().top () == 0) { idl_global->err ()->lookup_error (item); - + // This is probably the result of bad IDL. // We will crash if we continue from here. exit (99); @@ -670,7 +670,7 @@ FE_OBVHeader::compile_supports (UTL_NameList *supports) UTL_Scope *s = idl_global->scopes ().top (); d = s->lookup_by_name (item, - I_TRUE); + true); if (d == 0) { @@ -688,7 +688,7 @@ FE_OBVHeader::compile_supports (UTL_NameList *supports) if (d == 0) { idl_global->err ()->lookup_error (item); - + // This is probably the result of bad IDL. // We will crash if we continue from here. exit (99); @@ -744,7 +744,7 @@ FE_OBVHeader::compile_supports (UTL_NameList *supports) } } -idl_bool +bool FE_OBVHeader::check_concrete_supported_inheritance (AST_Interface *d) { AST_ValueType *vt = 0; @@ -783,12 +783,12 @@ FE_OBVHeader::check_concrete_supported_inheritance (AST_Interface *d) FE_EventHeader::FE_EventHeader (UTL_ScopedName *n, UTL_NameList *inherits, UTL_NameList *supports, - idl_bool truncatable) + bool truncatable) : FE_OBVHeader (n, inherits, supports, truncatable, - I_TRUE) + true) { } @@ -798,15 +798,15 @@ FE_EventHeader::~FE_EventHeader (void) //************************************************************************ -FE_ComponentHeader::FE_ComponentHeader (UTL_ScopedName *n, - UTL_ScopedName *base_component, +FE_ComponentHeader::FE_ComponentHeader (UTL_ScopedName *n, + UTL_ScopedName *base_component, UTL_NameList *supports, - idl_bool /* compile_now */) + bool /* compile_now */) : FE_InterfaceHeader (n, supports, - I_FALSE, - I_FALSE, - I_FALSE), + false, + false, + false), pd_base_component (0) { if (base_component != 0 && supports != 0) @@ -836,7 +836,7 @@ FE_ComponentHeader::supports (void) const return this->pd_inherits; } -long +long FE_ComponentHeader::n_supports (void) const { return this->pd_n_inherits; @@ -863,20 +863,20 @@ FE_ComponentHeader::compile_inheritance (UTL_ScopedName *base_component) { return; } - + UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Decl *d = s->lookup_by_name (base_component, - I_TRUE); + true); if (d == 0) { idl_global->err ()->lookup_error (base_component); - + // This is probably the result of bad IDL. // We will crash if we continue from here. exit (99); } - + if (d->node_type () == AST_Decl::NT_typedef) { d = AST_Typedef::narrow_from_decl (d)->primitive_base_type (); @@ -927,7 +927,7 @@ FE_ComponentHeader::compile_supports (UTL_NameList *supports) if (idl_global->scopes ().top () == 0) { idl_global->err ()->lookup_error (item); - + // This is probably the result of bad IDL. // We will crash if we continue from here. exit (99); @@ -937,7 +937,7 @@ FE_ComponentHeader::compile_supports (UTL_NameList *supports) UTL_Scope *s = idl_global->scopes ().top (); d = s->lookup_by_name (item, - I_TRUE); + true); if (d == 0) { @@ -955,7 +955,7 @@ FE_ComponentHeader::compile_supports (UTL_NameList *supports) if (d == 0) { idl_global->err ()->lookup_error (item); - + // This is probably the result of bad IDL. // We will crash if we continue from here. exit (99); @@ -975,7 +975,7 @@ FE_ComponentHeader::compile_supports (UTL_NameList *supports) idl_global->err ()->interface_expected (d); continue; } - + // Undefined interface? if (!i->is_defined ()) { @@ -1037,7 +1037,7 @@ FE_HomeHeader::FE_HomeHeader (UTL_ScopedName *n, : FE_ComponentHeader (n, 0, supports, - I_FALSE), + false), pd_base_home (0), pd_primary_key (0) { @@ -1086,12 +1086,12 @@ FE_HomeHeader::compile_inheritance (UTL_ScopedName *base_home) UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Decl *d = s->lookup_by_name (base_home, - I_TRUE); + true); if (d == 0) { idl_global->err ()->lookup_error (base_home); - + // This is probably the result of bad IDL. // We will crash if we continue from here. exit (99); @@ -1121,12 +1121,12 @@ FE_HomeHeader::compile_managed_component (UTL_ScopedName *managed_component) UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Decl *d = s->lookup_by_name (managed_component, - I_TRUE); + true); if (d == 0) { idl_global->err ()->lookup_error (managed_component); - + // This is probably the result of bad IDL. // We will crash if we continue from here. exit (99); @@ -1153,20 +1153,20 @@ FE_HomeHeader::compile_primary_key (UTL_ScopedName *primary_key) { return; } - + UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Decl *d = s->lookup_by_name (primary_key, - I_TRUE); + true); if (d == 0) { idl_global->err ()->lookup_error (primary_key); - + // This is probably the result of bad IDL. // We will crash if we continue from here. exit (99); } - + AST_Decl::NodeType nt = d->node_type (); if (nt == AST_Decl::NT_typedef) diff --git a/TAO/TAO_IDL/fe/idl.yy b/TAO/TAO_IDL/fe/idl.yy index 589cfedb255..3a76f839298 100644 --- a/TAO/TAO_IDL/fe/idl.yy +++ b/TAO/TAO_IDL/fe/idl.yy @@ -598,7 +598,7 @@ interface_header : * list of all interfaces which this interface inherits from, * recursively */ - UTL_ScopedName n = 0; + UTL_ScopedName *n = 0; ACE_NEW_RETURN (n, UTL_ScopedName ($1, 0), 1); @@ -622,7 +622,7 @@ interface_header : * list of all interfaces which this interface inherits from, * recursively */ - UTL_ScopedName n = 0; + UTL_ScopedName *n = 0; ACE_NEW_RETURN (n, UTL_ScopedName ($2, 0), 1); @@ -646,7 +646,7 @@ interface_header : * list of all interfaces which this interface inherits from, * recursively */ - UTL_ScopedName n = 0; + UTL_ScopedName *n = 0; ACE_NEW_RETURN (n, UTL_ScopedName ($2, 0), 1); @@ -734,7 +734,7 @@ value_concrete_decl : */ v = AST_ValueType::narrow_from_decl (i); (void) s->fe_add_valuetype (v); - + // FE_OBVHeader is not automatically destroyed in the AST $1->destroy (); delete $1; @@ -968,7 +968,7 @@ value_box_decl { // value_box_decl : value_decl type_spec idl_global->set_parse_state (IDL_GlobalData::PS_ValueBoxDeclSeen); - + UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ($1, 0); @@ -977,7 +977,7 @@ value_box_decl { /* * Get the type_spec associated with the valuebox - */ + */ AST_Type *tp = 0; AST_Typedef *td = AST_Typedef::narrow_from_decl ($2); @@ -1740,14 +1740,12 @@ literal | IDL_TRUETOK { // | IDL_TRUETOK - $$ = idl_global->gen ()->create_expr ((idl_bool) I_TRUE, - AST_Expression::EV_bool); + $$ = idl_global->gen ()->create_expr (true); } | IDL_FALSETOK { // | IDL_FALSETOK - $$ = idl_global->gen ()->create_expr ((idl_bool) I_FALSE, - AST_Expression::EV_bool); + $$ = idl_global->gen ()->create_expr (false); } ; @@ -5246,7 +5244,7 @@ event_decl : */ e = AST_EventType::narrow_from_decl (i); (void) s->fe_add_eventtype (e); - + // FE_EventHeader is not automatically destroyed in the AST $2->destroy (); delete $2; diff --git a/TAO/TAO_IDL/fe/lex.yy.cpp b/TAO/TAO_IDL/fe/lex.yy.cpp index 3d7d81fec6e..921497bca71 100644 --- a/TAO/TAO_IDL/fe/lex.yy.cpp +++ b/TAO/TAO_IDL/fe/lex.yy.cpp @@ -902,7 +902,7 @@ static idl_uns_long idl_atoui (char *, long); static void idl_parse_line_and_file (char *); static void idl_store_pragma (char *); static char * idl_get_pragma_string (char *); -static idl_bool idl_valid_version (char *); +static bool idl_valid_version (char *); static AST_Decl * idl_find_node (char *); #define ace_tao_yytext tao_yytext @@ -2655,9 +2655,9 @@ idl_parse_line_and_file (char *buf) } UTL_String *fname = idl_global->filename (); - idl_bool in_main_file = I_FALSE; - idl_bool is_real_filename = fname->compare (idl_global->real_filename ()); - idl_bool is_main_filename = I_FALSE; + bool in_main_file = false; + bool is_real_filename = fname->compare (idl_global->real_filename ()); + bool is_main_filename = false; if (!is_real_filename) { @@ -2666,7 +2666,7 @@ idl_parse_line_and_file (char *buf) if (is_real_filename || is_main_filename) { - in_main_file = I_TRUE; + in_main_file = true; } idl_global->set_in_main_file (in_main_file); @@ -2738,13 +2738,13 @@ idl_store_pragma (char *buf) if (ACE_OS::strstr (buf + 8, "import") != 0) { - idl_global->set_import (I_TRUE); + idl_global->set_import (true); return; } if (ACE_OS::strstr (buf + 8, "include") != 0) { - idl_global->set_import (I_FALSE); + idl_global->set_import (false); return; } @@ -2770,7 +2770,7 @@ idl_store_pragma (char *buf) if (depth > 1) { - top_scope->has_prefix (I_TRUE); + top_scope->has_prefix (true); ScopeAsDecl (top_scope)->prefix_scope (top_scope); } @@ -2779,8 +2779,8 @@ idl_store_pragma (char *buf) if (idl_global->in_main_file ()) { idl_global->root ()->prefix (new_prefix); - idl_global->root ()->set_imported (I_FALSE); - top_scope->has_prefix (I_TRUE); + idl_global->root ()->set_imported (false); + top_scope->has_prefix (true); } ACE_CString ext_id; @@ -2871,7 +2871,7 @@ idl_store_pragma (char *buf) } d->repoID (new_id); - d->typeid_set (I_TRUE); + d->typeid_set (true); } } else if (ACE_OS::strncmp (buf + 8, "DCPS_DATA_TYPE", 14) == 0) @@ -3205,7 +3205,7 @@ idl_get_pragma_string (char *pragma) return retval; } -static idl_bool +static bool idl_valid_version (char *s) { // Nothing preceding decimal point. @@ -3268,7 +3268,7 @@ idl_find_node (char *s) if (node != 0) { d = idl_global->scopes ().top_non_null ()->lookup_by_name (node, - I_TRUE); + true); } if (d == 0) diff --git a/TAO/TAO_IDL/fe/y.tab.cpp b/TAO/TAO_IDL/fe/y.tab.cpp index 110900c9d50..10d326b9998 100644 --- a/TAO/TAO_IDL/fe/y.tab.cpp +++ b/TAO/TAO_IDL/fe/y.tab.cpp @@ -1,8 +1,8 @@ // $Id$ -/* A Bison parser, made by GNU Bison 1.875c. */ +/* A Bison parser, made by GNU Bison 1.875d. */ /* Skeleton parser for Yacc-like parsing with Bison, - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -306,7 +306,7 @@ typedef union TAO_YYSTYPE { AST_Argument::Direction dival; /* Argument direction */ AST_Operation::Flags ofval; /* Operation flags */ FE_Declarator *deval; /* Declarator value */ - idl_bool bval; /* Boolean value */ + bool bval; /* Boolean value */ long ival; /* Long value */ idl_uns_long uival; /* Unsigned long value */ double dval; /* Double value */ @@ -380,7 +380,7 @@ typedef union TAO_YYSTYPE { /* A type that is properly aligned for any stack member. */ union tao_yyalloc { - short tao_yyss; + short int tao_yyss; TAO_YYSTYPE tao_yyvs; }; @@ -390,7 +390,7 @@ union tao_yyalloc /* The size of an array large to enough to hold all stacks, each with N elements. */ # define TAO_YYSTACK_BYTES(N) \ - ((N) * (sizeof (short) + sizeof (TAO_YYSTYPE)) \ + ((N) * (sizeof (short int) + sizeof (TAO_YYSTYPE)) \ + TAO_YYSTACK_GAP_MAXIMUM) /* Copy COUNT objects from FROM to TO. The source and destination do @@ -432,7 +432,7 @@ union tao_yyalloc #if defined (__STDC__) || defined (__cplusplus) typedef signed char tao_yysigned_char; #else - typedef short tao_yysigned_char; + typedef short int tao_yysigned_char; #endif /* TAO_YYFINAL -- State number of the termination state. */ @@ -498,7 +498,7 @@ static const unsigned char tao_yytranslate[] = #if TAO_YYDEBUG /* TAO_YYPRHS[TAO_YYN] -- Index of the first RHS symbol of rule number TAO_YYN in TAO_YYRHS. */ -static const unsigned short tao_yyprhs[] = +static const unsigned short int tao_yyprhs[] = { 0, 0, 3, 5, 8, 9, 10, 14, 15, 19, 20, 24, 25, 29, 30, 34, 35, 39, 40, 44, @@ -551,7 +551,7 @@ static const unsigned short tao_yyprhs[] = }; /* TAO_YYRHS -- A `-1'-separated list of the rules' RHS. */ -static const short tao_yyrhs[] = +static const short int tao_yyrhs[] = { 101, 0, -1, 102, -1, 102, 103, -1, -1, -1, 190, 104, 79, -1, -1, 351, 105, 79, -1, -1, @@ -677,56 +677,56 @@ static const short tao_yyrhs[] = }; /* TAO_YYRLINE[TAO_YYN] -- source line where rule number TAO_YYN was defined. */ -static const unsigned short tao_yyrline[] = +static const unsigned short int tao_yyrline[] = { - 0, 319, 319, 322, 323, 328, 327, 338, 337, 348, - 347, 358, 357, 368, 367, 378, 377, 388, 387, 398, - 397, 408, 407, 418, 417, 428, 427, 438, 437, 451, - 456, 480, 485, 450, 501, 502, 507, 546, 551, 506, - 569, 568, 582, 611, 633, 658, 657, 669, 676, 677, - 678, 679, 683, 694, 699, 738, 743, 698, 772, 811, - 816, 770, 835, 833, 871, 870, 884, 890, 897, 904, - 911, 933, 956, 970, 971, 975, 976, 977, 983, 982, - 990, 989, 999, 1000, 1005, 1004, 1015, 1014, 1025, 1024, - 1035, 1034, 1045, 1044, 1055, 1054, 1065, 1064, 1075, 1074, - 1088, 1101, 1099, 1129, 1136, 1147, 1146, 1172, 1170, 1191, - 1202, 1239, 1263, 1290, 1295, 1300, 1305, 1289, 1354, 1355, - 1356, 1357, 1358, 1359, 1360, 1372, 1377, 1448, 1450, 1452, - 1453, 1467, 1468, 1482, 1483, 1496, 1497, 1507, 1520, 1521, - 1531, 1544, 1545, 1555, 1565, 1578, 1579, 1589, 1599, 1612, - 1642, 1643, 1652, 1657, 1664, 1669, 1674, 1679, 1685, 1690, - 1696, 1705, 1779, 1778, 1788, 1793, 1798, 1803, 1826, 1835, - 1834, 1887, 1888, 1892, 1900, 1901, 1929, 1930, 1931, 1932, - 1933, 1934, 1935, 1936, 1940, 1941, 1942, 1946, 1947, 1948, - 1952, 1953, 1957, 1970, 1968, 1998, 2005, 2006, 2010, 2023, - 2021, 2051, 2058, 2075, 2094, 2095, 2099, 2104, 2109, 2117, - 2122, 2127, 2135, 2140, 2145, 2153, 2167, 2172, 2180, 2188, - 2196, 2204, 2213, 2212, 2228, 2258, 2263, 2227, 2282, 2285, - 2286, 2290, 2290, 2300, 2305, 2299, 2364, 2363, 2378, 2377, - 2392, 2397, 2402, 2407, 2450, 2455, 2391, 2479, 2487, 2501, - 2511, 2519, 2520, 2617, 2620, 2621, 2626, 2631, 2625, 2661, - 2660, 2674, 2685, 2707, 2715, 2714, 2730, 2735, 2729, 2752, - 2751, 2800, 2820, 2841, 2846, 2875, 2880, 2840, 2906, 2911, - 2909, 2916, 2920, 2955, 2960, 2953, 3017, 3072, 3082, 3071, - 3097, 3102, 3095, 3134, 3158, 3168, 3173, 3166, 3203, 3226, - 3235, 3234, 3264, 3275, 3297, 3305, 3310, 3304, 3338, 3339, - 3344, 3349, 3354, 3359, 3343, 3420, 3425, 3430, 3435, 3419, - 3501, 3506, 3532, 3537, 3500, 3555, 3560, 3613, 3618, 3553, - 3655, 3661, 3668, 3675, 3676, 3688, 3694, 3731, 3687, 3753, - 3752, 3763, 3762, 3775, 3780, 3778, 3785, 3790, 3795, 3789, - 3832, 3831, 3842, 3841, 3854, 3859, 3857, 3864, 3869, 3874, - 3868, 3917, 3925, 3926, 3927, 3970, 3975, 3980, 3989, 3994, - 3988, 4006, 4014, 4019, 4013, 4031, 4039, 4044, 4038, 4056, - 4064, 4069, 4063, 4081, 4088, 4101, 4099, 4127, 4134, 4155, - 4185, 4186, 4190, 4216, 4256, 4261, 4215, 4280, 4285, 4278, - 4311, 4310, 4321, 4328, 4329, 4334, 4333, 4344, 4343, 4354, - 4353, 4364, 4363, 4374, 4373, 4384, 4383, 4396, 4437, 4455, - 4480, 4530, 4536, 4543, 4577, 4611, 4646, 4645, 4695, 4700, - 4705, 4710, 4715, 4720, 4694, 4747, 4746, 4757, 4764, 4771, - 4779, 4784, 4778, 4796, 4797, 4801, 4803, 4802, 4813, 4812, - 4827, 4862, 4825, 4896, 4931, 4894, 4963, 4964, 4965, 4969, - 4970, 4974, 4998, 5025, 5066, 5071, 5023, 5088, 5098, 5117, - 5129, 5128, 5161, 5202, 5207, 5159, 5224, 5229 + 0, 320, 320, 323, 324, 329, 328, 339, 338, 349, + 348, 359, 358, 369, 368, 379, 378, 389, 388, 399, + 398, 409, 408, 419, 418, 429, 428, 439, 438, 452, + 457, 481, 486, 451, 502, 503, 508, 547, 552, 507, + 570, 569, 583, 614, 638, 665, 664, 676, 683, 684, + 685, 686, 690, 701, 706, 750, 755, 705, 784, 823, + 828, 782, 847, 845, 882, 881, 895, 901, 908, 915, + 922, 944, 967, 1020, 1021, 1025, 1026, 1027, 1033, 1032, + 1040, 1039, 1049, 1050, 1055, 1054, 1065, 1064, 1075, 1074, + 1085, 1084, 1095, 1094, 1105, 1104, 1115, 1114, 1125, 1124, + 1138, 1151, 1149, 1179, 1186, 1197, 1196, 1222, 1220, 1241, + 1252, 1289, 1313, 1340, 1345, 1350, 1355, 1339, 1404, 1405, + 1406, 1407, 1408, 1409, 1410, 1422, 1427, 1498, 1500, 1502, + 1503, 1517, 1518, 1532, 1533, 1546, 1547, 1557, 1570, 1571, + 1581, 1594, 1595, 1605, 1615, 1628, 1629, 1639, 1649, 1662, + 1692, 1693, 1702, 1707, 1714, 1719, 1724, 1729, 1735, 1740, + 1746, 1755, 1829, 1828, 1838, 1843, 1848, 1853, 1876, 1885, + 1884, 1937, 1938, 1942, 1950, 1951, 1979, 1980, 1981, 1982, + 1983, 1984, 1985, 1986, 1990, 1991, 1992, 1996, 1997, 1998, + 2002, 2003, 2007, 2020, 2018, 2048, 2055, 2056, 2060, 2073, + 2071, 2101, 2108, 2125, 2144, 2145, 2149, 2154, 2159, 2167, + 2172, 2177, 2185, 2190, 2195, 2203, 2217, 2222, 2230, 2238, + 2246, 2254, 2263, 2262, 2278, 2308, 2313, 2277, 2332, 2335, + 2336, 2340, 2340, 2350, 2355, 2349, 2414, 2413, 2428, 2427, + 2442, 2447, 2452, 2457, 2500, 2505, 2441, 2529, 2537, 2551, + 2561, 2569, 2570, 2667, 2670, 2671, 2676, 2681, 2675, 2711, + 2710, 2724, 2735, 2757, 2765, 2764, 2780, 2785, 2779, 2802, + 2801, 2850, 2870, 2891, 2896, 2925, 2930, 2890, 2956, 2961, + 2959, 2966, 2970, 3005, 3010, 3003, 3067, 3122, 3132, 3121, + 3147, 3152, 3145, 3184, 3208, 3218, 3223, 3216, 3253, 3276, + 3285, 3284, 3314, 3325, 3347, 3355, 3360, 3354, 3388, 3389, + 3394, 3399, 3404, 3409, 3393, 3470, 3475, 3480, 3485, 3469, + 3551, 3556, 3582, 3587, 3550, 3605, 3610, 3663, 3668, 3603, + 3705, 3711, 3718, 3725, 3726, 3738, 3744, 3781, 3737, 3803, + 3802, 3813, 3812, 3825, 3830, 3828, 3835, 3840, 3845, 3839, + 3882, 3881, 3892, 3891, 3904, 3909, 3907, 3914, 3919, 3924, + 3918, 3967, 3975, 3976, 3977, 4020, 4025, 4030, 4039, 4044, + 4038, 4056, 4064, 4069, 4063, 4081, 4089, 4094, 4088, 4106, + 4114, 4119, 4113, 4131, 4138, 4151, 4149, 4177, 4184, 4205, + 4235, 4236, 4240, 4266, 4306, 4311, 4265, 4330, 4335, 4328, + 4363, 4362, 4373, 4380, 4381, 4386, 4385, 4396, 4395, 4406, + 4405, 4416, 4415, 4426, 4425, 4436, 4435, 4448, 4489, 4507, + 4532, 4583, 4589, 4596, 4630, 4664, 4699, 4698, 4748, 4753, + 4758, 4763, 4768, 4773, 4747, 4802, 4801, 4812, 4819, 4826, + 4834, 4839, 4833, 4851, 4852, 4856, 4858, 4857, 4868, 4867, + 4882, 4917, 4880, 4951, 4986, 4949, 5018, 5019, 5020, 5024, + 5025, 5029, 5053, 5080, 5121, 5126, 5078, 5143, 5153, 5172, + 5184, 5183, 5216, 5262, 5267, 5214, 5284, 5289 }; #endif @@ -822,7 +822,7 @@ static const char *const tao_yytname[] = # ifdef TAO_YYPRINT /* TAO_YYTOKNUM[TAO_YYLEX-NUM] -- Internal token number corresponding to token TAO_YYLEX-NUM. */ -static const unsigned short tao_yytoknum[] = +static const unsigned short int tao_yytoknum[] = { 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, @@ -838,7 +838,7 @@ static const unsigned short tao_yytoknum[] = # endif /* TAO_YYR1[TAO_YYN] -- Symbol number of symbol that rule TAO_YYN derives. */ -static const unsigned short tao_yyr1[] = +static const unsigned short int tao_yyr1[] = { 0, 100, 101, 102, 102, 104, 103, 105, 103, 106, 103, 107, 103, 108, 103, 109, 103, 110, 103, 111, @@ -946,7 +946,7 @@ static const unsigned char tao_yyr2[] = /* TAO_YYDEFACT[STATE-NAME] -- Default rule to reduce with in state STATE-NUM when TAO_YYTABLE doesn't specify something else to do. Zero means the default is an error. */ -static const unsigned short tao_yydefact[] = +static const unsigned short int tao_yydefact[] = { 4, 0, 0, 1, 27, 113, 29, 40, 162, 222, 238, 273, 320, 0, 0, 0, 0, 64, 0, 0, @@ -1019,7 +1019,7 @@ static const unsigned short tao_yydefact[] = }; /* TAO_YYDEFGOTO[NTERM-NUM]. */ -static const short tao_yydefgoto[] = +static const short int tao_yydefgoto[] = { -1, 1, 2, 23, 146, 150, 151, 145, 149, 96, 95, 100, 152, 154, 156, 67, 24, 69, 225, 310, @@ -1059,7 +1059,7 @@ static const short tao_yydefgoto[] = /* TAO_YYPACT[STATE-NUM] -- Index in TAO_YYTABLE of the portion describing STATE-NUM. */ #define TAO_YYPACT_NINF -483 -static const short tao_yypact[] = +static const short int tao_yypact[] = { -483, 49, 1047, -483, -483, -483, -483, -483, -483, -483, -483, -483, -483, 61, 60, 66, 68, -483, 61, 61, @@ -1132,7 +1132,7 @@ static const short tao_yypact[] = }; /* TAO_YYPGOTO[NTERM-NUM]. */ -static const short tao_yypgoto[] = +static const short int tao_yypgoto[] = { -483, -483, 189, -483, -483, -483, -483, -483, -483, -483, -483, -483, -483, -483, -483, -483, -483, -483, -483, -483, @@ -1174,7 +1174,7 @@ static const short tao_yypgoto[] = number is the opposite. If zero, do what TAO_YYDEFACT says. If TAO_YYTABLE_NINF, syntax error. */ #define TAO_YYTABLE_NINF -475 -static const short tao_yytable[] = +static const short int tao_yytable[] = { 77, 78, 138, 92, 94, 88, 89, 169, 170, 134, 119, 135, 350, 38, 136, 163, 118, 166, 137, 167, @@ -1290,7 +1290,7 @@ static const short tao_yytable[] = 21, 22 }; -static const short tao_yycheck[] = +static const short int tao_yycheck[] = { 13, 13, 34, 21, 22, 18, 19, 68, 68, 34, 34, 34, 286, 2, 34, 68, 34, 68, 34, 68, @@ -1408,7 +1408,7 @@ static const short tao_yycheck[] = /* TAO_YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ -static const unsigned short tao_yystos[] = +static const unsigned short int tao_yystos[] = { 0, 101, 102, 0, 1, 4, 5, 6, 7, 20, 21, 23, 27, 40, 41, 42, 43, 49, 50, 53, @@ -1591,12 +1591,12 @@ do { \ #if defined (__STDC__) || defined (__cplusplus) static void -tao_yy_stack_print (short *bottom, short *top) +tao_yy_stack_print (short int *bottom, short int *top) #else static void tao_yy_stack_print (bottom, top) - short *bottom; - short *top; + short int *bottom; + short int *top; #endif { TAO_YYFPRINTF (stderr, "Stack now"); @@ -1853,9 +1853,9 @@ tao_yyparse () to reallocate them elsewhere. */ /* The state stack. */ - short tao_yyssa[TAO_YYINITDEPTH]; - short *tao_yyss = tao_yyssa; - register short *tao_yyssp; + short int tao_yyssa[TAO_YYINITDEPTH]; + short int *tao_yyss = tao_yyssa; + register short int *tao_yyssp; /* The semantic value stack. */ TAO_YYSTYPE tao_yyvsa[TAO_YYINITDEPTH]; @@ -1892,6 +1892,7 @@ tao_yyparse () tao_yyssp = tao_yyss; tao_yyvsp = tao_yyvs; + goto tao_yysetstate; /*------------------------------------------------------------. @@ -1917,7 +1918,7 @@ tao_yyparse () these so that the &'s don't force the real ones into memory. */ TAO_YYSTYPE *tao_yyvs1 = tao_yyvs; - short *tao_yyss1 = tao_yyss; + short int *tao_yyss1 = tao_yyss; /* Each stack pointer address is followed by the size of the @@ -1945,7 +1946,7 @@ tao_yyparse () tao_yystacksize = TAO_YYMAXDEPTH; { - short *tao_yyss1 = tao_yyss; + short int *tao_yyss1 = tao_yyss; union tao_yyalloc *tao_yyptr = (union tao_yyalloc *) TAO_YYSTACK_ALLOC (TAO_YYSTACK_BYTES (tao_yystacksize)); if (! tao_yyptr) @@ -2447,9 +2448,9 @@ tao_yyreduce: ACE_NEW_RETURN (tao_yyval.ihval, FE_InterfaceHeader (n, tao_yyvsp[0].nlval, - I_FALSE, - I_FALSE, - I_TRUE), + false, + false, + true), 1); } break; @@ -2473,9 +2474,9 @@ tao_yyreduce: ACE_NEW_RETURN (tao_yyval.ihval, FE_InterfaceHeader (n, tao_yyvsp[0].nlval, - I_TRUE, - I_FALSE, - I_TRUE), + true, + false, + true), 1); } break; @@ -2499,9 +2500,9 @@ tao_yyreduce: ACE_NEW_RETURN (tao_yyval.ihval, FE_InterfaceHeader (n, tao_yyvsp[0].nlval, - I_FALSE, - I_TRUE, - I_TRUE), + false, + true, + true), 1); } break; @@ -2566,9 +2567,9 @@ tao_yyreduce: tao_yyvsp[0].vhval->supports (), tao_yyvsp[0].vhval->n_supports (), tao_yyvsp[0].vhval->supports_concrete (), - I_FALSE, + false, tao_yyvsp[0].vhval->truncatable (), - I_FALSE + false ); i = AST_Interface::narrow_from_decl (v); AST_Interface::fwd_redefinition_helper (i, @@ -2578,7 +2579,7 @@ tao_yyreduce: */ v = AST_ValueType::narrow_from_decl (i); (void) s->fe_add_valuetype (v); - + // FE_OBVHeader is not automatically destroyed in the AST tao_yyvsp[0].vhval->destroy (); delete tao_yyvsp[0].vhval; @@ -2652,9 +2653,9 @@ tao_yyreduce: tao_yyvsp[0].vhval->supports (), tao_yyvsp[0].vhval->n_supports (), tao_yyvsp[0].vhval->supports_concrete (), - I_TRUE, - I_FALSE, - I_FALSE + true, + false, + false ); i = AST_Interface::narrow_from_decl (v); AST_Interface::fwd_redefinition_helper (i, @@ -2664,11 +2665,6 @@ tao_yyreduce: */ v = AST_ValueType::narrow_from_decl (i); (void) s->fe_add_valuetype (v); - - // FE_OBVHeader is not automatically destroyed in the AST - tao_yyvsp[0].vhval->destroy (); - delete tao_yyvsp[0].vhval; - tao_yyvsp[0].vhval = 0; } /* @@ -2740,7 +2736,7 @@ tao_yyreduce: FE_OBVHeader (sn, tao_yyvsp[-2].nlval, tao_yyvsp[0].nlval, - tao_yyvsp[-2].nlval ? tao_yyvsp[-2].nlval->truncatable () : I_FALSE), + tao_yyvsp[-2].nlval ? tao_yyvsp[-2].nlval->truncatable () : false), 1); } break; @@ -2766,7 +2762,7 @@ tao_yyreduce: { // opt_truncatable : IDL_TRUNCATABLE - tao_yyval.bval = I_TRUE; + tao_yyval.bval = true; } break; @@ -2774,7 +2770,7 @@ tao_yyreduce: { /* | EMPTY */ - tao_yyval.bval = I_FALSE; + tao_yyval.bval = false; } break; @@ -2811,7 +2807,7 @@ tao_yyreduce: if (s != 0) { f = idl_global->gen ()->create_valuetype_fwd (&n, - I_TRUE); + true); (void) s->fe_add_valuetype_fwd (f); } } @@ -2834,7 +2830,7 @@ tao_yyreduce: if (s != 0) { f = idl_global->gen ()->create_valuetype_fwd (&n, - I_FALSE); + false); (void) s->fe_add_valuetype_fwd (f); } } @@ -2845,7 +2841,7 @@ tao_yyreduce: { // value_box_decl : value_decl type_spec idl_global->set_parse_state (IDL_GlobalData::PS_ValueBoxDeclSeen); - + UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n (tao_yyvsp[-1].idval, 0); @@ -2854,7 +2850,7 @@ tao_yyreduce: { /* * Get the type_spec associated with the valuebox - */ + */ AST_Type *tp = 0; AST_Typedef *td = AST_Typedef::narrow_from_decl (tao_yyvsp[0].dcval); @@ -2890,7 +2886,7 @@ tao_yyreduce: (void) s->fe_add_valuebox (vb); } } - } + } break; case 78: @@ -3376,7 +3372,7 @@ tao_yyreduce: */ AST_Decl *d = s->lookup_by_name (tao_yyvsp[0].idlist, - I_TRUE); + true); if (s != 0 && d != 0) { @@ -3616,7 +3612,7 @@ tao_yyreduce: */ UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Decl *d = s->lookup_by_name (tao_yyvsp[0].idlist, - I_TRUE); + true); /* * If the scoped name is an IDL constant, it may be used in an @@ -3710,8 +3706,7 @@ tao_yyreduce: { // | IDL_TRUETOK - tao_yyval.exval = idl_global->gen ()->create_expr ((idl_bool) I_TRUE, - AST_Expression::EV_bool); + tao_yyval.exval = idl_global->gen ()->create_expr (true); } break; @@ -3719,8 +3714,7 @@ tao_yyreduce: { // | IDL_FALSETOK - tao_yyval.exval = idl_global->gen ()->create_expr ((idl_bool) I_FALSE, - AST_Expression::EV_bool); + tao_yyval.exval = idl_global->gen ()->create_expr (false); } break; @@ -3949,7 +3943,7 @@ tao_yyreduce: if (s != 0) { d = s->lookup_by_name (tao_yyvsp[0].idlist, - I_TRUE); + true); } if (d == 0) @@ -4607,7 +4601,7 @@ tao_yyreduce: AST_Decl *d = 0; AST_PredefinedType *p = 0; AST_Typedef *t = 0; - idl_bool found = I_FALSE; + bool found = false; /* * The discriminator is a scoped name. Try to resolve to @@ -4616,7 +4610,7 @@ tao_yyreduce: * chain. */ d = s->lookup_by_name (tao_yyvsp[0].idlist, - I_TRUE); + true); if (s != 0 && d != 0) { @@ -4626,7 +4620,7 @@ tao_yyreduce: { case AST_Decl::NT_enum: tao_yyval.dcval = d; - found = I_TRUE; + found = true; break; case AST_Decl::NT_pre_defined: p = AST_PredefinedType::narrow_from_decl (d); @@ -4644,7 +4638,7 @@ tao_yyreduce: case AST_PredefinedType::PT_char: case AST_PredefinedType::PT_boolean: tao_yyval.dcval = p; - found = I_TRUE; + found = true; break; case AST_PredefinedType::PT_wchar: case AST_PredefinedType::PT_octet: @@ -4653,18 +4647,18 @@ tao_yyreduce: UTL_Error::EIDL_DISC_TYPE ); tao_yyval.dcval = 0; - found = I_TRUE; + found = true; break; default: tao_yyval.dcval = 0; - found = I_TRUE; + found = true; break; } } else { tao_yyval.dcval = 0; - found = I_TRUE; + found = true; } break; @@ -4679,7 +4673,7 @@ tao_yyreduce: break; default: tao_yyval.dcval = 0; - found = I_TRUE; + found = true; break; } } @@ -5557,7 +5551,7 @@ tao_yyreduce: a = idl_global->gen ()->create_attribute ( - I_TRUE, + true, tp, (UTL_IdList *) d->name ()->copy (), s->is_local (), @@ -5645,7 +5639,7 @@ tao_yyreduce: a = idl_global->gen ()->create_attribute ( - I_FALSE, + false, tp, (UTL_IdList *) d->name ()->copy (), s->is_local (), @@ -5773,7 +5767,7 @@ tao_yyreduce: { AST_Decl *d = ScopeAsDecl (s); AST_Decl::NodeType nt = d->node_type (); - idl_bool local = + bool local = s->is_local () || nt == AST_Decl::NT_valuetype || nt == AST_Decl::NT_eventtype; @@ -6163,7 +6157,7 @@ tao_yyreduce: if (s != 0) { d = s->lookup_by_name (tao_yyvsp[0].idlist, - I_TRUE); + true); } if (d == 0) @@ -6407,7 +6401,7 @@ tao_yyreduce: // typeid_dcl : IDL_TYPEID scoped_name IDL_STRING_LITERAL UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Decl *d = s->lookup_by_name (tao_yyvsp[-1].idlist, - I_TRUE); + true); if (d == 0) { @@ -6436,7 +6430,7 @@ tao_yyreduce: if (d->name ()->compare (tao_yyvsp[-1].idlist) != 0) { d = s->lookup_by_name (tao_yyvsp[-1].idlist, - I_TRUE); + true); } if (d == 0) @@ -6582,7 +6576,7 @@ tao_yyreduce: FE_ComponentHeader (n, tao_yyvsp[-2].idlist, tao_yyvsp[0].nlval, - I_FALSE), + false), 1); } break; @@ -6717,7 +6711,7 @@ tao_yyreduce: if (c != 0) { AST_Decl *d = s->lookup_by_name (tao_yyvsp[-1].idlist, - I_TRUE); + true); if (d == 0) { idl_global->err ()->lookup_error (tao_yyvsp[-1].idlist); @@ -6752,7 +6746,7 @@ tao_yyreduce: // interface_type : scoped_name UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Decl *d = s->lookup_by_name (tao_yyvsp[0].idlist, - I_TRUE); + true); if (d == 0) { @@ -6798,7 +6792,7 @@ tao_yyreduce: // uses_decl : IDL_USES opt_multiple interface_type id UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Decl *d = s->lookup_by_name (tao_yyvsp[-1].idlist, - I_TRUE); + true); if (d == 0) { @@ -6827,7 +6821,7 @@ tao_yyreduce: ud.is_multiple = tao_yyvsp[-2].bval; c->uses ().enqueue_tail (ud); - if (ud.is_multiple == I_TRUE + if (ud.is_multiple == true && !idl_global->using_ifr_backend () && !idl_global->ignore_idl3 ()) { @@ -6844,7 +6838,7 @@ tao_yyreduce: { // opt_multiple : IDL_MULTIPLE - tao_yyval.bval = I_TRUE; + tao_yyval.bval = true; } break; @@ -6852,7 +6846,7 @@ tao_yyreduce: { /* | EMPTY */ - tao_yyval.bval = I_FALSE; + tao_yyval.bval = false; } break; @@ -6862,7 +6856,7 @@ tao_yyreduce: // emits_decl : IDL_EMITS scoped_name id UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Decl *d = s->lookup_by_name (tao_yyvsp[-1].idlist, - I_TRUE); + true); if (d == 0) { @@ -6894,7 +6888,7 @@ tao_yyreduce: // publishes_decl : IDL_PUBLISHES scoped_name id UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Decl *d = s->lookup_by_name (tao_yyvsp[-1].idlist, - I_TRUE); + true); if (d == 0) { @@ -6926,7 +6920,7 @@ tao_yyreduce: // consumes_decl : IDL_CONSUMES scoped_name id UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Decl *d = s->lookup_by_name (tao_yyvsp[-1].idlist, - I_TRUE); + true); if (d == 0) { @@ -7194,8 +7188,8 @@ tao_yyreduce: home->managed_component (), AST_Operation::OP_noflags, &n, - I_FALSE, - I_FALSE + false, + false ); home->factories ().enqueue_tail (o); } @@ -7268,8 +7262,8 @@ tao_yyreduce: home->managed_component (), AST_Operation::OP_noflags, &n, - I_FALSE, - I_FALSE + false, + false ); home->finders ().enqueue_tail (o); } @@ -7337,7 +7331,7 @@ tao_yyreduce: if (s != 0) { f = idl_global->gen ()->create_eventtype_fwd (&n, - I_FALSE); + false); (void) s->fe_add_valuetype_fwd (f); } } @@ -7360,7 +7354,7 @@ tao_yyreduce: if (s != 0) { f = idl_global->gen ()->create_eventtype_fwd (&n, - I_TRUE); + true); (void) s->fe_add_valuetype_fwd (f); } } @@ -7389,9 +7383,9 @@ tao_yyreduce: tao_yyvsp[0].ehval->supports (), tao_yyvsp[0].ehval->n_supports (), tao_yyvsp[0].ehval->supports_concrete (), - I_TRUE, - I_FALSE, - I_FALSE + true, + false, + false ); i = AST_Interface::narrow_from_decl (e); AST_Interface::fwd_redefinition_helper (i, @@ -7401,11 +7395,6 @@ tao_yyreduce: */ e = AST_EventType::narrow_from_decl (i); (void) s->fe_add_eventtype (e); - - // FE_EventHeader is not automatically destroyed in the AST - tao_yyvsp[0].ehval->destroy (); - delete tao_yyvsp[0].ehval; - tao_yyvsp[0].ehval = 0; } /* @@ -7508,7 +7497,7 @@ tao_yyreduce: FE_EventHeader (0, tao_yyvsp[-2].nlval, tao_yyvsp[0].nlval, - tao_yyvsp[-2].nlval ? tao_yyvsp[-2].nlval->truncatable () : I_FALSE), + tao_yyvsp[-2].nlval ? tao_yyvsp[-2].nlval->truncatable () : false), 1); } break; @@ -7536,9 +7525,9 @@ tao_yyreduce: tao_yyvsp[0].ehval->supports (), tao_yyvsp[0].ehval->n_supports (), tao_yyvsp[0].ehval->supports_concrete (), - I_FALSE, + false, tao_yyvsp[0].ehval->truncatable (), - I_FALSE + false ); i = AST_Interface::narrow_from_decl (e); AST_Interface::fwd_redefinition_helper (i, @@ -7548,6 +7537,11 @@ tao_yyreduce: */ e = AST_EventType::narrow_from_decl (i); (void) s->fe_add_eventtype (e); + + // FE_EventHeader is not automatically destroyed in the AST + tao_yyvsp[0].ehval->destroy (); + delete tao_yyvsp[0].ehval; + tao_yyvsp[0].ehval = 0; } /* @@ -7605,7 +7599,7 @@ tao_yyreduce: } -/* Line 1000 of yacc.c. */ +/* Line 1010 of yacc.c. */ tao_yyvsp -= tao_yylen; diff --git a/TAO/TAO_IDL/fe/y.tab.cpp.diff b/TAO/TAO_IDL/fe/y.tab.cpp.diff index 0357abf4ae1..6dceda2e081 100644 --- a/TAO/TAO_IDL/fe/y.tab.cpp.diff +++ b/TAO/TAO_IDL/fe/y.tab.cpp.diff @@ -1,6 +1,6 @@ --- y.tab.cpp.orig 2005-01-28 10:00:07.000000000 -0600 +++ y.tab.cpp 2005-01-28 10:07:56.000000000 -0600 -@@ -1758,11 +1758,6 @@ +@@ -1759,11 +1759,6 @@ else TAO_YYFPRINTF (tao_yyoutput, "nterm %s (", tao_yytname[tao_yytype]); @@ -12,7 +12,7 @@ TAO_YYFPRINTF (tao_yyoutput, ")"); } -@@ -1782,14 +1777,9 @@ +@@ -1778,14 +1778,9 @@ #endif { /* Pacify ``unused variable'' warnings. */ @@ -26,9 +26,8 @@ - break; - } } - -@@ -7687,7 +7677,7 @@ +@@ -7741,7 +7741,7 @@ `---------------------------------------------------*/ tao_yyerrorlab: diff --git a/TAO/TAO_IDL/fe/y.tab.h b/TAO/TAO_IDL/fe/y.tab.h index 3667943b930..ffd1faa3772 100644 --- a/TAO/TAO_IDL/fe/y.tab.h +++ b/TAO/TAO_IDL/fe/y.tab.h @@ -210,7 +210,7 @@ typedef union TAO_YYSTYPE { AST_Argument::Direction dival; /* Argument direction */ AST_Operation::Flags ofval; /* Operation flags */ FE_Declarator *deval; /* Declarator value */ - idl_bool bval; /* Boolean value */ + bool bval; /* Boolean value */ long ival; /* Long value */ idl_uns_long uival; /* Unsigned long value */ double dval; /* Double value */ diff --git a/TAO/TAO_IDL/include/ast_array.h b/TAO/TAO_IDL/include/ast_array.h index f202333fd4d..19b1cfa3f13 100644 --- a/TAO/TAO_IDL/include/ast_array.h +++ b/TAO/TAO_IDL/include/ast_array.h @@ -88,8 +88,8 @@ public: AST_Array (UTL_ScopedName *n, unsigned long ndims, UTL_ExprList *dims, - idl_bool local, - idl_bool abstract); + bool local, + bool abstract); // Destructor. virtual ~AST_Array (void); diff --git a/TAO/TAO_IDL/include/ast_attribute.h b/TAO/TAO_IDL/include/ast_attribute.h index c1f2998aeaf..14610600371 100644 --- a/TAO/TAO_IDL/include/ast_attribute.h +++ b/TAO/TAO_IDL/include/ast_attribute.h @@ -81,18 +81,18 @@ public: // Constructor(s). AST_Attribute (void); - AST_Attribute (idl_bool readonly, + AST_Attribute (bool readonly, AST_Type *ft, UTL_ScopedName *n, - idl_bool local, - idl_bool abstract); + bool local, + bool abstract); // Destructor. virtual ~AST_Attribute (void); // Data Accessors. - idl_bool readonly (void) const; + bool readonly (void) const; UTL_ExceptList *get_get_exceptions (void) const; UTL_ExceptList *get_set_exceptions (void) const; @@ -113,7 +113,7 @@ public: private: // Data. - const idl_bool pd_readonly; + const bool pd_readonly; // Is attribute read-only? UTL_ExceptList *pd_get_exceptions; diff --git a/TAO/TAO_IDL/include/ast_component.h b/TAO/TAO_IDL/include/ast_component.h index 6e41a2d41ec..b3369adf483 100644 --- a/TAO/TAO_IDL/include/ast_component.h +++ b/TAO/TAO_IDL/include/ast_component.h @@ -26,11 +26,11 @@ public: // Extend lookup to the base component. virtual AST_Decl *look_in_inherited (UTL_ScopedName *e, - idl_bool treat_as_ref); + bool treat_as_ref); // Extend lookup to the supported interfaces. virtual AST_Decl *look_in_supported (UTL_ScopedName *e, - idl_bool treat_as_ref); + bool treat_as_ref); // Utility data structure for port declarations. struct port_description @@ -41,7 +41,7 @@ public: // Fields. Identifier *id; AST_Type *impl; - idl_bool is_multiple; + bool is_multiple; }; // Accessors. @@ -74,7 +74,7 @@ public: // Check if we have redefined any of our parents' operations or attributes, // and check if there is such a clash among the parents - virtual idl_bool redef_clash (void); + virtual bool redef_clash (void); private: AST_Component *pd_base_component; diff --git a/TAO/TAO_IDL/include/ast_constant.h b/TAO/TAO_IDL/include/ast_constant.h index c94aae1ff6a..9ce723c00d8 100644 --- a/TAO/TAO_IDL/include/ast_constant.h +++ b/TAO/TAO_IDL/include/ast_constant.h @@ -102,8 +102,8 @@ public: AST_Expression::ExprType et (void); // Accessors for the private member. - idl_bool ifr_added (void); - void ifr_added (idl_bool val); + bool ifr_added (void); + void ifr_added (bool val); const char *exprtype_to_string (void); // Returns the appropriate type. @@ -134,7 +134,7 @@ protected: AST_Expression::ExprType pd_et; // Its expression type. - idl_bool ifr_added_; + bool ifr_added_; // Has this node been added to the IFR? }; diff --git a/TAO/TAO_IDL/include/ast_decl.h b/TAO/TAO_IDL/include/ast_decl.h index ce6cedc495b..5e7df502f84 100644 --- a/TAO/TAO_IDL/include/ast_decl.h +++ b/TAO/TAO_IDL/include/ast_decl.h @@ -95,13 +95,13 @@ class TAO_IDL_FE_Export COMMON_Base { public: - COMMON_Base (idl_bool local = I_FALSE, - idl_bool abstract = I_FALSE); + COMMON_Base (bool local = false, + bool abstract = false); virtual ~COMMON_Base (void) {} - virtual idl_bool is_local (void); - virtual idl_bool is_abstract (void); + virtual bool is_local (void); + virtual bool is_abstract (void); // A no-op, overridden in the child classes. virtual void destroy (void); @@ -110,8 +110,8 @@ public: DEF_NARROW_METHODS0(COMMON_Base); protected: - idl_bool is_local_; - idl_bool is_abstract_; + bool is_local_; + bool is_abstract_; }; class TAO_IDL_FE_Export AST_Decl : public virtual COMMON_Base @@ -163,17 +163,17 @@ public: AST_Decl (NodeType type, UTL_ScopedName *n, - idl_bool anonymous = I_FALSE); + bool anonymous = false); virtual ~AST_Decl (void); // Data Accessors. - idl_bool imported (void); - void set_imported (idl_bool is_it); + bool imported (void); + void set_imported (bool is_it); - idl_bool in_main_file (void); - void set_in_main_file (idl_bool is_it); + bool in_main_file (void); + void set_in_main_file (bool is_it); UTL_Scope *defined_in (void); void set_defined_in (UTL_Scope *); @@ -220,12 +220,12 @@ public: void version (char *value); // Accessors for the version_ member. - idl_bool anonymous (void) const; - void anonymous (idl_bool val); + bool anonymous (void) const; + void anonymous (bool val); // Accessors for the anonymous_ member. - idl_bool typeid_set (void) const; - void typeid_set (idl_bool val); + bool typeid_set (void) const; + void typeid_set (bool val); // Accessors for the typeid_set_ member. void set_id_with_typeid (char *value); @@ -244,8 +244,8 @@ public: Identifier *original_local_name (void); void original_local_name (Identifier *); - idl_bool added (void); - void set_added (idl_bool is_it); + bool added (void); + void set_added (bool is_it); // Narrowing. DEF_NARROW_METHODS0(AST_Decl); @@ -263,12 +263,12 @@ public: // Other operations // Return TRUE if "this" has "s" as an ancestor. - idl_bool has_ancestor (AST_Decl *s); + bool has_ancestor (AST_Decl *s); // Return TRUE if "this" is a child of "s". - idl_bool is_child (AST_Decl *s); + bool is_child (AST_Decl *s); - idl_bool is_nested (void); + bool is_nested (void); // Determines if we are inside of a nested scope or not. UTL_ScopedName *last_referenced_as (void) const; @@ -310,10 +310,10 @@ protected: private: // Data - idl_bool pd_imported; + bool pd_imported; // Imported? - idl_bool pd_in_main_file; + bool pd_in_main_file; // Defined in main file? UTL_Scope *pd_defined_in; @@ -336,7 +336,7 @@ private: Identifier *pd_original_local_name; // _cxx_ removed if any. - idl_bool pd_added; + bool pd_added; // Already added. char *full_name_; @@ -348,10 +348,10 @@ private: char *version_; // Set by #pragma version. - idl_bool anonymous_; + bool anonymous_; // Are we an anonymous (no repo ID) type? - idl_bool typeid_set_; + bool typeid_set_; // Has our repo id been set by a typeId declaration? UTL_ScopedName *last_referenced_as_; diff --git a/TAO/TAO_IDL/include/ast_enum.h b/TAO/TAO_IDL/include/ast_enum.h index e563f48c217..9add0c75bc7 100644 --- a/TAO/TAO_IDL/include/ast_enum.h +++ b/TAO/TAO_IDL/include/ast_enum.h @@ -78,8 +78,8 @@ class TAO_IDL_FE_Export AST_Enum : public virtual AST_ConcreteType, public: AST_Enum (void); AST_Enum (UTL_ScopedName *n, - idl_bool local, - idl_bool abstract); + bool local, + bool abstract); virtual ~AST_Enum (void); diff --git a/TAO/TAO_IDL/include/ast_eventtype.h b/TAO/TAO_IDL/include/ast_eventtype.h index 97c9bc35169..d1fe9509207 100644 --- a/TAO/TAO_IDL/include/ast_eventtype.h +++ b/TAO/TAO_IDL/include/ast_eventtype.h @@ -20,9 +20,9 @@ public: 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); virtual ~AST_EventType (void); diff --git a/TAO/TAO_IDL/include/ast_exception.h b/TAO/TAO_IDL/include/ast_exception.h index 16b7f2d16a7..e6c5e52c77a 100644 --- a/TAO/TAO_IDL/include/ast_exception.h +++ b/TAO/TAO_IDL/include/ast_exception.h @@ -83,12 +83,12 @@ public: AST_Exception (void); AST_Exception (UTL_ScopedName *n, - idl_bool local, - idl_bool abstract); + bool local, + bool abstract); virtual ~AST_Exception (void); - virtual idl_bool in_recursion (ACE_Unbounded_Queue<AST_Type *> &list); + virtual bool in_recursion (ACE_Unbounded_Queue<AST_Type *> &list); // Check if we or the parameter node is in recursion. // Narrowing diff --git a/TAO/TAO_IDL/include/ast_expression.h b/TAO/TAO_IDL/include/ast_expression.h index b06a8b759ed..f379f6cd1d6 100644 --- a/TAO/TAO_IDL/include/ast_expression.h +++ b/TAO/TAO_IDL/include/ast_expression.h @@ -167,7 +167,7 @@ public: unsigned short usval; // Contains unsigned short expr value. long lval; // Contains long expression value. unsigned long ulval; // Contains unsigned long expr value. - unsigned long bval; // Contains boolean expression value. + bool bval; // Contains boolean expression value. #if ! defined (ACE_LACKS_LONGLONG_T) ACE_CDR::LongLong llval; // Contains long long expr value. #endif /* ! defined (ACE_LACKS_LONGLONG_T) */ @@ -205,8 +205,7 @@ public: AST_Expression (long l); - AST_Expression (long l, - ExprType t); + AST_Expression (bool b); AST_Expression (unsigned long ul); @@ -301,7 +300,7 @@ protected: AST_ExprValue *eval_symbol (EvalKind ek); - idl_bool type_mismatch (ExprType et); + bool type_mismatch (ExprType et); private: UTL_Scope *pd_defined_in; diff --git a/TAO/TAO_IDL/include/ast_extern.h b/TAO/TAO_IDL/include/ast_extern.h index e585686937b..b58e8ed493f 100644 --- a/TAO/TAO_IDL/include/ast_extern.h +++ b/TAO/TAO_IDL/include/ast_extern.h @@ -67,7 +67,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #ifndef _AST_EXTERN_AST_EXTERN_HH #define _AST_EXTERN_AST_EXTERN_HH -#include "idl_bool.h" + class AST_Type; class AST_Decl; @@ -81,8 +81,8 @@ class AST_Decl; extern void AST_record_fwd_decl (AST_Type *i); extern TAO_IDL_FE_Export void AST_check_fwd_decls (void); -extern idl_bool AST_illegal_recursive_type (AST_Decl *t); -extern idl_bool AST_illegal_interface_recursion (AST_Decl *t); +extern bool AST_illegal_recursive_type (AST_Decl *t); +extern bool AST_illegal_interface_recursion (AST_Decl *t); #endif // _AST_EXTERN_AST_EXTERN_HH diff --git a/TAO/TAO_IDL/include/ast_generator.h b/TAO/TAO_IDL/include/ast_generator.h index b3604e4a00f..6d71b7be83b 100644 --- a/TAO/TAO_IDL/include/ast_generator.h +++ b/TAO/TAO_IDL/include/ast_generator.h @@ -109,15 +109,15 @@ public: long n_inherits, AST_Interface **inherits_flat, long n_inherits_flat, - idl_bool local, - idl_bool abstract + bool local, + bool abstract ); // Create a node representing a forward declaration of an interface. virtual AST_InterfaceFwd *create_interface_fwd ( UTL_ScopedName *n, - idl_bool local, - idl_bool abstract + bool local, + bool abstract ); // Create a node representing a valuetype. @@ -131,15 +131,15 @@ public: 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 ); // Create a node representing a forward declaration of a valuetype. virtual AST_ValueTypeFwd *create_valuetype_fwd ( UTL_ScopedName *n, - idl_bool abstract + bool abstract ); // Create a node representing an eventtype. @@ -153,15 +153,15 @@ public: 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 ); // Create a node representing a forward declaration of an eventtype. virtual AST_EventTypeFwd *create_eventtype_fwd ( UTL_ScopedName *n, - idl_bool abstract + bool abstract ); // Create a node representing a component. @@ -194,15 +194,15 @@ public: // Create a node representing an exception. virtual AST_Exception *create_exception ( UTL_ScopedName *n, - idl_bool local, - idl_bool abstract + bool local, + bool abstract ); // Create a node representing a structure. virtual AST_Structure *create_structure ( UTL_ScopedName *n, - idl_bool local, - idl_bool abstract + bool local, + bool abstract ); // Create a node representing a forward declaration of a structure. @@ -210,16 +210,16 @@ public: // Create a node representing an enum. virtual AST_Enum *create_enum (UTL_ScopedName *n, - idl_bool local, - idl_bool abstract); + bool local, + bool abstract); // Create a node representing an operation on an interface. virtual AST_Operation *create_operation ( AST_Type *rt, AST_Operation::Flags fl, UTL_ScopedName *n, - idl_bool local, - idl_bool abstract + bool local, + bool abstract ); // Create a node representing a field in a structure, exception or @@ -238,18 +238,18 @@ public: // Create a node representing an attribute. virtual AST_Attribute *create_attribute ( - idl_bool ro, + bool ro, AST_Type *ft, UTL_ScopedName *n, - idl_bool local, - idl_bool abstract + bool local, + bool abstract ); // Create a node representing a union. virtual AST_Union *create_union (AST_ConcreteType *dt, UTL_ScopedName *n, - idl_bool local, - idl_bool abstract); + bool local, + bool abstract); // Create a node representing a forward declaration of a union. virtual AST_UnionFwd *create_union_fwd (UTL_ScopedName *n); @@ -284,8 +284,7 @@ public: virtual AST_Expression *create_expr (long v); - virtual AST_Expression *create_expr (long v, - AST_Expression::ExprType t); + virtual AST_Expression *create_expr (bool b); virtual AST_Expression *create_expr (idl_uns_long v, AST_Expression::ExprType t); @@ -308,15 +307,15 @@ public: virtual AST_Array *create_array (UTL_ScopedName *n, unsigned long ndims, UTL_ExprList *dims, - idl_bool local, - idl_bool abstract); + bool local, + bool abstract); // Create a node representing a sequence type. virtual AST_Sequence *create_sequence (AST_Expression *v, AST_Type *bt, UTL_ScopedName *n, - idl_bool local, - idl_bool abstract); + bool local, + bool abstract); // Create a node representing a string type. virtual AST_String *create_string (AST_Expression *v); @@ -327,8 +326,8 @@ public: // Create a node representing a type renaming (typedef). virtual AST_Typedef*create_typedef (AST_Type *bt, UTL_ScopedName *n, - idl_bool local, - idl_bool abstract); + bool local, + bool abstract); // Create a node representing a native. virtual AST_Native *create_native (UTL_ScopedName *n); diff --git a/TAO/TAO_IDL/include/ast_home.h b/TAO/TAO_IDL/include/ast_home.h index 1bf5818b68c..02456b18065 100644 --- a/TAO/TAO_IDL/include/ast_home.h +++ b/TAO/TAO_IDL/include/ast_home.h @@ -29,18 +29,18 @@ public: // Extend lookup to the base home. virtual AST_Decl *look_in_inherited (UTL_ScopedName *e, - idl_bool treat_as_ref); + bool treat_as_ref); // Extend lookup to the supported interfaces. virtual AST_Decl *look_in_supported (UTL_ScopedName *e, - idl_bool treat_as_ref); - + bool treat_as_ref); + // Accessors. AST_Home *base_home (void) const; AST_Interface **supports (void) const; - + long n_supports (void) const; AST_Component *managed_component (void) const; diff --git a/TAO/TAO_IDL/include/ast_interface.h b/TAO/TAO_IDL/include/ast_interface.h index 913743ba7f9..f085eb3055f 100644 --- a/TAO/TAO_IDL/include/ast_interface.h +++ b/TAO/TAO_IDL/include/ast_interface.h @@ -86,8 +86,8 @@ public: long nih, AST_Interface **ih_flat, long nih_flat, - idl_bool local, - idl_bool abstract); + bool local, + bool abstract); virtual ~AST_Interface (void); @@ -117,23 +117,23 @@ public: // Is this interface defined? This predicate returns FALSE when an // interface was forward declared but not defined yet, and TRUE in // all other cases. - idl_bool is_defined (void) + bool is_defined (void) { - return (pd_n_inherits < 0) ? I_FALSE : I_TRUE; + return (pd_n_inherits < 0) ? false : true; } // Check if we have redefined any of our parents' operations or attributes, // and check if there is such a clash among the parents - virtual idl_bool redef_clash (void); - + virtual bool redef_clash (void); + // Accessors for the member. - idl_bool home_equiv (void) const; - void home_equiv (idl_bool val); + bool home_equiv (void) const; + void home_equiv (bool val); // Look through inherited interfaces. virtual AST_Decl *look_in_inherited (UTL_ScopedName *e, - idl_bool treat_as_ref); - + bool treat_as_ref); + // Recursively called on valuetype to check for legal use as // a primary key. Overridden for valuetype, struct, sequence, // union, array, typedef, and interface. @@ -178,9 +178,9 @@ protected: // Queue of dequeued nodes to be searched for the above case. ACE_Unbounded_Queue<AST_Interface *> del_queue; - + // Are we the equivalent interface of a home? - idl_bool home_equiv_; + bool home_equiv_; protected: // Scope Management Protocol. @@ -216,7 +216,7 @@ protected: // Lookup based on the local name, override of UTL_Scope definition. // This version checks for redefinitions of attributes or operations. AST_Decl *lookup_for_add (AST_Decl *d, - idl_bool treat_as_ref); + bool treat_as_ref); void redef_clash_populate_r (AST_Interface *t); // Populate the insert queue with our parents, and, if we are a @@ -224,7 +224,7 @@ protected: // supported interfaces. int insert_non_dup (AST_Interface *t, - idl_bool abstract_paths_only = I_FALSE); + bool abstract_paths_only = false); // Do non-duplicating insert of bi, by searching both the // insert queue and the delete queue. }; diff --git a/TAO/TAO_IDL/include/ast_interface_fwd.h b/TAO/TAO_IDL/include/ast_interface_fwd.h index dd7db4a8060..10490254d1d 100644 --- a/TAO/TAO_IDL/include/ast_interface_fwd.h +++ b/TAO/TAO_IDL/include/ast_interface_fwd.h @@ -86,11 +86,11 @@ public: AST_Interface *full_definition (void); void set_full_definition (AST_Interface *nfd); - virtual idl_bool is_defined (void); + virtual bool is_defined (void); - virtual idl_bool is_local (void); - virtual idl_bool is_valuetype (void); - virtual idl_bool is_abstract_valuetype (void); + virtual bool is_local (void); + virtual bool is_valuetype (void); + virtual bool is_abstract_valuetype (void); // Cleanup function. virtual void destroy (void); diff --git a/TAO/TAO_IDL/include/ast_module.h b/TAO/TAO_IDL/include/ast_module.h index e220bb8579f..62afe2b1ff1 100644 --- a/TAO/TAO_IDL/include/ast_module.h +++ b/TAO/TAO_IDL/include/ast_module.h @@ -100,7 +100,7 @@ public: // Involved in OBV_ namespace generation. void set_has_nested_valuetype (void); - idl_bool has_nested_valuetype (void); + bool has_nested_valuetype (void); // Allows adding an interface to a later point // The interface i is inserted after interface ix, if @@ -110,7 +110,7 @@ public: // Has this node been referenced here already? // Override of method in UTL_Scope. - virtual idl_bool referenced (AST_Decl *e, + virtual bool referenced (AST_Decl *e, Identifier *id = 0); // Add decls from previous opening of this module to the @@ -181,7 +181,7 @@ private: virtual AST_ValueBox *fe_add_valuebox (AST_ValueBox *vb); - idl_bool pd_has_nested_valuetype; + bool pd_has_nested_valuetype; ACE_Unbounded_Set<AST_Decl *> previous_; // Container for declaration from previous openings of this module. diff --git a/TAO/TAO_IDL/include/ast_operation.h b/TAO/TAO_IDL/include/ast_operation.h index e3716c3947c..95f38818309 100644 --- a/TAO/TAO_IDL/include/ast_operation.h +++ b/TAO/TAO_IDL/include/ast_operation.h @@ -90,8 +90,8 @@ public: AST_Operation (AST_Type *return_type, Flags flags, UTL_ScopedName *n, - idl_bool local, - idl_bool abstract); + bool local, + bool abstract); // Destructor. virtual ~AST_Operation (void); diff --git a/TAO/TAO_IDL/include/ast_sequence.h b/TAO/TAO_IDL/include/ast_sequence.h index 0da4d06d455..2bdcfb4c264 100644 --- a/TAO/TAO_IDL/include/ast_sequence.h +++ b/TAO/TAO_IDL/include/ast_sequence.h @@ -68,7 +68,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #define _AST_SEQUENCE_AST_SEQUENCE_HH #include "ast_concrete_type.h" -#include "idl_bool.h" + class AST_Expression; class AST_Type; @@ -83,12 +83,12 @@ public: AST_Sequence (AST_Expression *max_size, AST_Type *bt, UTL_ScopedName *n, - idl_bool local, - idl_bool abstract); + bool local, + bool abstract); virtual ~AST_Sequence (void); - virtual idl_bool in_recursion (ACE_Unbounded_Queue<AST_Type *> &list); + virtual bool in_recursion (ACE_Unbounded_Queue<AST_Type *> &list); // Are we or the node represented by node involved in recursion. // Data Accessors. @@ -96,7 +96,7 @@ public: AST_Type *base_type (void) const; - virtual idl_bool unbounded (void) const; + virtual bool unbounded (void) const; // Is this sequence bounded or not. // Recursively called on valuetype to check for legal use as @@ -122,7 +122,7 @@ private: AST_Type *pd_base_type; // Sequence base type. - idl_bool unbounded_; + bool unbounded_; // Whether we are bounded or unbounded. }; diff --git a/TAO/TAO_IDL/include/ast_structure.h b/TAO/TAO_IDL/include/ast_structure.h index 1ff0d431aed..98d228d833c 100644 --- a/TAO/TAO_IDL/include/ast_structure.h +++ b/TAO/TAO_IDL/include/ast_structure.h @@ -88,13 +88,13 @@ public: AST_Structure (void); AST_Structure (UTL_ScopedName *n, - idl_bool local, - idl_bool abstract); + bool local, + bool abstract); AST_Structure (AST_Decl::NodeType nt, UTL_ScopedName *n, - idl_bool local, - idl_bool abstract); + bool local, + bool abstract); virtual ~AST_Structure (void); @@ -120,10 +120,10 @@ public: size_t slot) const; // Get an individual field node. - virtual idl_bool is_local (void); + virtual bool is_local (void); // Overwrite the is_local method. - virtual idl_bool in_recursion (ACE_Unbounded_Queue<AST_Type *> &list); + virtual bool in_recursion (ACE_Unbounded_Queue<AST_Type *> &list); // Are we or the node represented by node involved in recursion. virtual int contains_wstring (void); @@ -132,7 +132,7 @@ public: // Is this struct or union defined? This predicate returns FALSE when a // forward declaration is not defined yet, and TRUE in // all other cases. - idl_bool is_defined (void) + bool is_defined (void) { return this->size_type () != AST_Type::SIZE_UNKNOWN; } @@ -181,7 +181,7 @@ private: int member_count_; // Number of members. - idl_bool local_struct_; + int local_struct_; // We also need to determine whether we contain any local type. }; diff --git a/TAO/TAO_IDL/include/ast_structure_fwd.h b/TAO/TAO_IDL/include/ast_structure_fwd.h index c447182c240..031b46ab61b 100644 --- a/TAO/TAO_IDL/include/ast_structure_fwd.h +++ b/TAO/TAO_IDL/include/ast_structure_fwd.h @@ -23,7 +23,7 @@ public: AST_Structure *full_definition (void); void set_full_definition (AST_Structure *nfd); - virtual idl_bool is_defined (void); + virtual bool is_defined (void); // Cleanup function. virtual void destroy (void); diff --git a/TAO/TAO_IDL/include/ast_type.h b/TAO/TAO_IDL/include/ast_type.h index 97c275bcbe6..e7c5967b92b 100644 --- a/TAO/TAO_IDL/include/ast_type.h +++ b/TAO/TAO_IDL/include/ast_type.h @@ -97,14 +97,14 @@ public: virtual ~AST_Type (void); - virtual idl_bool in_recursion (ACE_Unbounded_Queue<AST_Type *> &list); + virtual bool in_recursion (ACE_Unbounded_Queue<AST_Type *> &list); // Determine if we are involved in some kind of limited recursion. // Most types cannot be involved except structs and unions. // If the parameter is 0, we are trying to determine this for ourselves. // To be overridden by the subclasses interface, struct, union, and // the corresponding forward declaration classes. - virtual idl_bool is_defined (void); + virtual bool is_defined (void); virtual void size_type (SIZE_TYPE); // Set the size type. @@ -114,26 +114,26 @@ public: // Accessors/mutators for the private members. - idl_bool has_constructor (void); + bool has_constructor (void); // Accessor for protected member. - void has_constructor (idl_bool value); + void has_constructor (bool value); // Mutator for protected member. - idl_bool ifr_added (void); - void ifr_added (idl_bool val); + bool ifr_added (void); + void ifr_added (bool val); - idl_bool ifr_fwd_added (void); - void ifr_fwd_added (idl_bool val); + bool ifr_fwd_added (void); + void ifr_fwd_added (bool val); const char *nested_type_name (AST_Decl *d, const char *suffix = 0, const char *prefix = 0); // Type name of a node used when generating declarations. - + AST_Type *unaliased_type (void); // Utility function to make sure we are using the unaliased type. - + virtual bool legal_for_primary_key (void) const; // Recursively called on valuetype to check for legal use as // a primary key. Overridden for valuetype, struct, sequence, @@ -159,30 +159,30 @@ protected: const char *suffix, const char *prefix); // Type name of a node used when generating declarations. - - idl_bool match_names (AST_Type *t, ACE_Unbounded_Queue<AST_Type *> &list); - + + bool match_names (AST_Type *t, ACE_Unbounded_Queue<AST_Type *> &list); + protected: // Has the full definition been added to the Interface Repository? // Used for types which can have members and can be forward declared. - idl_bool ifr_added_; + bool ifr_added_; // Has this node been forward declared in this IDL file? - idl_bool ifr_fwd_added_; + bool ifr_fwd_added_; SIZE_TYPE size_type_; // Whether we are fixed or variable size (by default fixed). - idl_bool has_constructor_; + bool has_constructor_; // Attribute that helps a union determine whether a member // should be included by value or by reference. char *nested_type_name_; // For the corresponding method. - + long in_recursion_; // Storage once the value has been computed. - + mutable bool recursing_in_legal_pk_; // Node-specific flag to abort recursion in legal_for_primary_key(). }; diff --git a/TAO/TAO_IDL/include/ast_typedef.h b/TAO/TAO_IDL/include/ast_typedef.h index 073715168c5..e1fddbea1e5 100644 --- a/TAO/TAO_IDL/include/ast_typedef.h +++ b/TAO/TAO_IDL/include/ast_typedef.h @@ -82,8 +82,8 @@ public: AST_Typedef (AST_Type *base_type, UTL_ScopedName *n, - idl_bool local, - idl_bool abstract); + bool local, + bool abstract); virtual ~AST_Typedef (void); @@ -93,7 +93,7 @@ public: // Data Accessors. AST_Type *base_type (void) const; - + virtual bool legal_for_primary_key (void) const; // Recursively called on valuetype to check for legal use as // a primary key. Overridden for valuetype, struct, sequence, diff --git a/TAO/TAO_IDL/include/ast_union.h b/TAO/TAO_IDL/include/ast_union.h index fdc784341fc..e412e49ea60 100644 --- a/TAO/TAO_IDL/include/ast_union.h +++ b/TAO/TAO_IDL/include/ast_union.h @@ -87,8 +87,8 @@ public: AST_Union (AST_ConcreteType *disc_type, UTL_ScopedName *n, - idl_bool local, - idl_bool abstract); + bool local, + bool abstract); // Destructor. virtual ~AST_Union (void); @@ -96,7 +96,7 @@ public: // This also calls the base class version. virtual void redefine (AST_Structure *from); - virtual idl_bool in_recursion (ACE_Unbounded_Queue<AST_Type *> &list); + virtual bool in_recursion (ACE_Unbounded_Queue<AST_Type *> &list); // Are we or the parameter node involved in some kind of recursion? // Data Accessors. @@ -116,7 +116,7 @@ public: { char char_val; ACE_CDR::WChar wchar_val; - unsigned long bool_val; + bool bool_val; ACE_INT16 short_val; ACE_UINT16 ushort_val; ACE_INT32 long_val; @@ -185,7 +185,7 @@ private: virtual AST_Enum *fe_add_enum (AST_Enum *e); virtual AST_EnumVal *fe_add_enum_val (AST_EnumVal *v); - + virtual int compute_default_value (void); // Compute the default value (if any). diff --git a/TAO/TAO_IDL/include/ast_valuetype.h b/TAO/TAO_IDL/include/ast_valuetype.h index 8e787eed3f6..8283d388664 100644 --- a/TAO/TAO_IDL/include/ast_valuetype.h +++ b/TAO/TAO_IDL/include/ast_valuetype.h @@ -20,9 +20,9 @@ public: 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); virtual ~AST_ValueType (void); @@ -37,16 +37,16 @@ public: AST_Interface *supports_concrete (void) const; - idl_bool truncatable (void) const; - idl_bool custom (void) const; + bool truncatable (void) const; + bool custom (void) const; - virtual idl_bool will_have_factory (void); + virtual bool will_have_factory (void); // Called from y.tab.cpp to set the factory decl seen bit. // Look up a scoped name in the supported interface list. virtual AST_Decl *look_in_supported (UTL_ScopedName *, - idl_bool treat_as_ref); - + bool treat_as_ref); + // Recursively called on valuetype to check for legal use as // a primary key. Overridden for valuetype, struct, sequence, // union, array, typedef, and interface. @@ -72,8 +72,8 @@ protected: AST_ValueType *pd_inherits_concrete; AST_Interface *pd_supports_concrete; - idl_bool pd_truncatable; - idl_bool pd_custom; + bool pd_truncatable; + bool pd_custom; protected: virtual AST_Factory *fe_add_factory (AST_Factory *f); diff --git a/TAO/TAO_IDL/include/fe_interface_header.h b/TAO/TAO_IDL/include/fe_interface_header.h index ac4bcdbb686..a3ecb1d9e9c 100644 --- a/TAO/TAO_IDL/include/fe_interface_header.h +++ b/TAO/TAO_IDL/include/fe_interface_header.h @@ -89,9 +89,9 @@ class TAO_IDL_FE_Export FE_InterfaceHeader public: FE_InterfaceHeader (UTL_ScopedName *n, UTL_NameList *inherits, - idl_bool is_local, - idl_bool is_abstract, - idl_bool compile_now); + bool is_local, + bool is_abstract, + bool compile_now); virtual ~FE_InterfaceHeader (void); @@ -102,12 +102,12 @@ public: AST_Interface **inherits_flat (void) const; long n_inherits_flat (void) const; - idl_bool is_local (void) const; + bool is_local (void) const; // See if we are a local interface. - idl_bool is_abstract (void) const; + bool is_abstract (void) const; // See if we are an abstract interface. - + void destroy (void); // Destroy anything allocated for this class. @@ -123,8 +123,8 @@ protected: AST_Interface **pd_inherits_flat; long pd_n_inherits_flat; - idl_bool pd_is_local; - idl_bool pd_is_abstract; + bool pd_is_local; + bool pd_is_abstract; // Operations. @@ -132,24 +132,24 @@ protected: // interface inherits from. protected: void compile_inheritance (UTL_NameList *ifaces, - idl_bool for_valuetype); + bool for_valuetype); void compile_one_inheritance (AST_Interface *i); // Called from compile_inheritance(). int check_inherit (AST_Interface *i, - idl_bool for_valuetype); + bool for_valuetype); }; class TAO_IDL_FE_Export FE_OBVHeader : public FE_InterfaceHeader { public: - FE_OBVHeader (UTL_ScopedName *n, - UTL_NameList *inherits, + FE_OBVHeader (UTL_ScopedName *n, + UTL_NameList *inherits, UTL_NameList *supports, - idl_bool truncatable, - idl_bool is_eventtype = I_FALSE); + bool truncatable, + bool is_eventtype = false); virtual ~FE_OBVHeader (void); // Data Accessors. @@ -157,7 +157,7 @@ public: long n_supports (void) const; AST_ValueType *inherits_concrete (void) const; AST_Interface *supports_concrete (void) const; - idl_bool truncatable (void) const; + bool truncatable (void) const; protected: // Supported interfaces. @@ -168,38 +168,38 @@ protected: AST_Interface *pd_supports_concrete; // Currently ignored. - idl_bool pd_truncatable; + bool pd_truncatable; protected: void compile_inheritance (UTL_NameList *vtypes, - idl_bool is_eventtype); + bool is_eventtype); void compile_supports (UTL_NameList *supports); - idl_bool check_concrete_supported_inheritance (AST_Interface *d); + bool check_concrete_supported_inheritance (AST_Interface *d); }; class TAO_IDL_FE_Export FE_EventHeader : public FE_OBVHeader { public: - FE_EventHeader (UTL_ScopedName *n, - UTL_NameList *inherits, + FE_EventHeader (UTL_ScopedName *n, + UTL_NameList *inherits, UTL_NameList *supports, - idl_bool truncatable); + bool truncatable); virtual ~FE_EventHeader (void); }; // Unlike value types, a component's supported interfaces are simply // added to the inheritance list in generated code, so we use the -// existing base class mechanism for managing the inheritance list +// existing base class mechanism for managing the inheritance list // to manage the derived class's supported interface list. class TAO_IDL_FE_Export FE_ComponentHeader : public FE_InterfaceHeader { public: - FE_ComponentHeader (UTL_ScopedName *n, - UTL_ScopedName *base_component, + FE_ComponentHeader (UTL_ScopedName *n, + UTL_ScopedName *base_component, UTL_NameList *supports, - idl_bool compile_now); + bool compile_now); virtual ~FE_ComponentHeader (void); // Data Accessors. @@ -208,7 +208,7 @@ public: long n_supports (void) const; AST_Interface **supports_flat (void) const; long n_supports_flat (void) const; - + protected: void compile_inheritance (UTL_ScopedName *base_component); void compile_supports (UTL_NameList *supports); @@ -226,8 +226,8 @@ class TAO_IDL_FE_Export FE_HomeHeader : public FE_ComponentHeader { public: - FE_HomeHeader (UTL_ScopedName *n, - UTL_ScopedName *base_home, + FE_HomeHeader (UTL_ScopedName *n, + UTL_ScopedName *base_home, UTL_NameList *supports, UTL_ScopedName *managed_component, UTL_ScopedName *primary_key); diff --git a/TAO/TAO_IDL/include/global_extern.h b/TAO/TAO_IDL/include/global_extern.h index dce69d00c37..1f10dabf63e 100644 --- a/TAO/TAO_IDL/include/global_extern.h +++ b/TAO/TAO_IDL/include/global_extern.h @@ -69,7 +69,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "TAO_IDL_FE_Export.h" #include "idl_global.h" -#include "idl_bool.h" + class AST_Decl; @@ -82,6 +82,6 @@ extern TAO_IDL_FE_Export IDL_GlobalData *idl_global; // Return TRUE when the name of this AST_Decl can be reused in // a definition in this scope -extern idl_bool can_be_redefined (AST_Decl *); +extern bool can_be_redefined (AST_Decl *); #endif // _GLOBAL_EXTERN_GLOBAL_EXTERN_HH diff --git a/TAO/TAO_IDL/include/idl_bool.h b/TAO/TAO_IDL/include/idl_bool.h deleted file mode 100644 index b7356d80247..00000000000 --- a/TAO/TAO_IDL/include/idl_bool.h +++ /dev/null @@ -1,86 +0,0 @@ -// $Id$ - -/* - -COPYRIGHT - -Copyright 1992, 1993, 1994 Sun Microsystems, Inc. Printed in the United -States of America. All Rights Reserved. - -This product is protected by copyright and distributed under the following -license restricting its use. - -The Interface Definition Language Compiler Front End (CFE) is made -available for your use provided that you include this license and copyright -notice on all media and documentation and the software program in which -this product is incorporated in whole or part. You may copy and extend -functionality (but may not remove functionality) of the Interface -Definition Language CFE without charge, but you are not authorized to -license or distribute it to anyone else except as part of a product or -program developed by you or with the express written consent of Sun -Microsystems, Inc. ("Sun"). - -The names of Sun Microsystems, Inc. and any of its subsidiaries or -affiliates may not be used in advertising or publicity pertaining to -distribution of Interface Definition Language CFE as permitted herein. - -This license is effective until terminated by Sun for failure to comply -with this license. Upon termination, you shall destroy or return all code -and documentation for the Interface Definition Language CFE. - -INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF -ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS -FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF -DEALING, USAGE OR TRADE PRACTICE. - -INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT -ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES -TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT. - -SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH -RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY -INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF. - -IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR -ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL -DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -Use, duplication, or disclosure by the government is subject to -restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in -Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR -52.227-19. - -Sun, Sun Microsystems and the Sun logo are trademarks or registered -trademarks of Sun Microsystems, Inc. - -SunSoft, Inc. -2550 Garcia Avenue -Mountain View, California 94043 - -NOTE: - -SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are -trademarks or registered trademarks of Sun Microsystems, Inc. - -*/ - -#ifndef _IDL_BOOL_IDL_BOOL_HH -#define _IDL_BOOL_IDL_BOOL_HH - -/* - * This is interim. When porting to a new platform, this file will be - * modified to incorporate definitions for the boolean type suitable - * for the new platform. - */ - -#ifndef I_TRUE -#define I_TRUE 1 -#endif - -#ifndef I_FALSE -#define I_FALSE 0 -#endif - -typedef long idl_bool; - -#endif // _IDL_BOOL_IDL_BOOL_HH diff --git a/TAO/TAO_IDL/include/idl_global.h b/TAO/TAO_IDL/include/idl_global.h index 683bf70c48d..850864965b5 100644 --- a/TAO/TAO_IDL/include/idl_global.h +++ b/TAO/TAO_IDL/include/idl_global.h @@ -73,7 +73,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "ace/Containers_T.h" #include "ace/Synch_Traits.h" #include "ace/Null_Mutex.h" -#include "idl_bool.h" + #include "ast_expression.h" #include "ast_predefined_type.h" #include "ast_component.h" @@ -365,12 +365,12 @@ public: virtual UTL_String *stripped_filename (void); // Stripped filename virtual void set_stripped_filename (UTL_String *); // Set it - virtual idl_bool imported (void); // Are we imported? - virtual idl_bool import (void); // Is import on? - virtual void set_import (idl_bool); // Set it + virtual bool imported (void); // Are we imported? + virtual bool import (void); // Is import on? + virtual void set_import (bool); // Set it - virtual idl_bool in_main_file (void); // Are we? - virtual void set_in_main_file (idl_bool); // Set it + virtual bool in_main_file (void); // Are we? + virtual void set_in_main_file (bool); // Set it virtual const char *prog_name (void); // Invoked as.. virtual void set_prog_name (const char *); // Set it @@ -414,7 +414,7 @@ public: // FE calls when #pragma DCPS_DATA_TYPE is processed virtual void add_dcps_data_type(const char* id); // FE calls when #pragma DCPS_DATA_KEY is processed - virtual idl_bool add_dcps_data_key(const char* id, const char* key); + virtual bool add_dcps_data_key(const char* id, const char* key); // returns null if not matching; otherwise pointer to the info virtual DCPS_Data_Type_Info* is_dcps_type(UTL_ScopedName* target); @@ -482,17 +482,17 @@ public: virtual const char *ident_string (void) const; // Get the value of the #ident string. - virtual void case_diff_error (idl_bool); + virtual void case_diff_error (bool); // report an error (1) for indentifiers in the same scope // that differ only by case, or report a warning (0). - virtual idl_bool case_diff_error (void); + virtual bool case_diff_error (void); // are we strict about case-only differences or not? - virtual void nest_orb (idl_bool); + virtual void nest_orb (bool); // Set on or off whether we are using the NEST ORB. - virtual idl_bool nest_orb (void); + virtual bool nest_orb (void); // are we beIng used with the NEST ORB? virtual void destroy (void); @@ -524,8 +524,8 @@ public: void last_seen_index (long val); // Accessors for last_seen_index_ member. - idl_bool repeat_include (void) const; - void repeat_include (idl_bool val); + bool repeat_include (void) const; + void repeat_include (bool val); // Accessors for repeat_include_ member. const char *stripped_preproc_include (const char *name); @@ -533,12 +533,12 @@ public: // strips off any command line -I prefix that may have been // prepended. - virtual idl_bool preserve_cpp_keywords (void); + virtual bool preserve_cpp_keywords (void); // Whether we should not mung idl element names that are // C++ keywords e.g. delete, operator etc. with _cxx_ prefix. // Should be true when being used by the IFR Service - virtual void preserve_cpp_keywords (idl_bool); + virtual void preserve_cpp_keywords (bool); // Set whether we should not mung idl element names that are C++ // keywords e.g. delete, operator etc. with _cxx_ prefix. // Is set by the IFR Service. @@ -550,8 +550,8 @@ public: file_prefixes (void); // Accessor for the IDL file prefix container. - idl_bool pass_orb_idl (void) const; - void pass_orb_idl (idl_bool val); + bool pass_orb_idl (void) const; + void pass_orb_idl (bool val); // Accessor for the pass_orb_idl_ member. bool using_ifr_backend (void) const; @@ -575,19 +575,19 @@ public: int path_cmp (const char *s, const char *t); // Case insensitive for Windows, otherwise not. - + bool hasspace (const char *s); // To tell if we have to handle a Windows path with spaces. - + ACE_Unbounded_Queue<AST_ValueType *> &primary_keys (void); // Accessor for the member. - + void check_primary_keys (void); // Called affer yy_parse() returns - iterates over our list // of primary keys. Must be called this late so that we can // be sure that all forward declared stucts or unions that // might be used in such a valuetype are fully defined. - + const char *recursion_start (void) const; void recursion_start (const char *val); // Accessors for the member. @@ -605,8 +605,8 @@ private: UTL_String *pd_main_filename; // What main filename UTL_String *pd_real_filename; // What real filename UTL_String *pd_stripped_filename; // Stripped filename - idl_bool pd_import; // Is import on? - idl_bool pd_in_main_file; // Are we in it? + bool pd_import; // Is import on? + bool pd_in_main_file; // Are we in it? const char *pd_prog_name; // Argv[0] const char *pd_cpp_location; // Where to find CPP long pd_compile_flags; // Compile flags @@ -645,11 +645,11 @@ private: // Holds a string that begins with #ident, to be passed from the IDL // file to the generated files. - idl_bool case_diff_error_; + bool case_diff_error_; // Do we report an error for indentifiers in the same scope that differ // only by case? or just a warning? - idl_bool nest_orb_; + bool nest_orb_; // Is this front end being used for the NEST ORB? ACE_CString idl_flags_; @@ -661,10 +661,10 @@ private: ACE_Unbounded_Stack<char *> pragma_prefixes_; // Container for all the #pragma prefix declarations. - idl_bool repeat_include_; + bool repeat_include_; // Has this IDL file been included before? - idl_bool preserve_cpp_keywords_; + bool preserve_cpp_keywords_; // Do we allow C++ keywords as identifiers in the idl to stay as they are ? ACE_Unbounded_Queue<char *> include_paths_; @@ -673,7 +673,7 @@ private: ACE_Hash_Map_Manager<ACE_CString, char *, ACE_Null_Mutex> file_prefixes_; // Associates a prefix with a file. - idl_bool pass_orb_idl_; + bool pass_orb_idl_; // Treat orb.idl like any other included IDL file. bool using_ifr_backend_; @@ -684,10 +684,10 @@ private: // we don't want to try to generate another event consumer. DCPS_Type_Info_Map dcps_type_info_map_ ; // Map of #pragma DCPS_DATA_TYPE and DCPS_DATA_KEY infomation. - + ACE_Unbounded_Queue<AST_ValueType *>primary_keys_; // List of valuetypes used as a primary key. - + char *recursion_start_; // Path to directory subtree we are iterating/recursing over. // Not used by all backends. diff --git a/TAO/TAO_IDL/include/utl_identifier.h b/TAO/TAO_IDL/include/utl_identifier.h index 769256dde2d..57742738473 100644 --- a/TAO/TAO_IDL/include/utl_identifier.h +++ b/TAO/TAO_IDL/include/utl_identifier.h @@ -68,7 +68,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #define _UTL_IDENTIFIER_UTL_IDENTIFIER_HH #include "TAO_IDL_FE_Export.h" -#include "idl_bool.h" + #include "ace/iosfwd.h" class TAO_IDL_FE_Export Identifier @@ -91,19 +91,19 @@ public: void replace_string (const char * s); // Replace the underlying string and free the old one. - long compare (Identifier *other); + bool compare (Identifier *other); // Compare with other Identifier. - long case_compare (Identifier *other); + bool case_compare (Identifier *other); // Also check for case-only difference. - long case_compare_quiet (Identifier *other); + bool case_compare_quiet (Identifier *other); // Like the above but suppressing error or warning I/O Identifier *copy (void); // Create a deep copy. - idl_bool escaped (void) const; + bool escaped (void) const; // Accessor for the member. virtual void dump (ACE_OSTREAM_TYPE &o); @@ -117,7 +117,7 @@ private: char *pv_string; // Did the IDL string have a leading underscore? - idl_bool escaped_; + bool escaped_; }; #endif // _UTL_IDENTIFIER_UTL_IDENTIFIER_HH diff --git a/TAO/TAO_IDL/include/utl_list.h b/TAO/TAO_IDL/include/utl_list.h index ac4f9c34f72..3e88833bc7b 100644 --- a/TAO/TAO_IDL/include/utl_list.h +++ b/TAO/TAO_IDL/include/utl_list.h @@ -76,7 +76,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc. // public virtual inheritance. #include "TAO_IDL_FE_Export.h" -#include "idl_bool.h" + // Forward declare active iterator for UTL_List. class UTL_ListActiveIterator; @@ -130,7 +130,7 @@ public: virtual void next (void); // Are we at the end of this list? - virtual idl_bool is_done (void); + virtual bool is_done (void); protected: // On what to iterate? diff --git a/TAO/TAO_IDL/include/utl_namelist.h b/TAO/TAO_IDL/include/utl_namelist.h index db5c5ed465d..5ab4995f3e0 100644 --- a/TAO/TAO_IDL/include/utl_namelist.h +++ b/TAO/TAO_IDL/include/utl_namelist.h @@ -80,22 +80,22 @@ trademarks or registered trademarks of Sun Microsystems, Inc. class TAO_IDL_FE_Export UTL_NameList : public UTL_List { public: - UTL_NameList (UTL_ScopedName *s, + UTL_NameList (UTL_ScopedName *s, UTL_NameList *cdr); // Get list item. UTL_ScopedName *head (void); // Accessors. - idl_bool truncatable (void) const; - void truncatable (idl_bool val); + bool truncatable (void) const; + void truncatable (bool val); private: // List item. UTL_ScopedName *pd_car_data; // Used only with valuetye inheritance list. Defualts to 0. - idl_bool pd_truncatable; + bool pd_truncatable; }; // Active iterator for UTL_NameList. diff --git a/TAO/TAO_IDL/include/utl_scope.h b/TAO/TAO_IDL/include/utl_scope.h index 81e53e1265e..6e22b9a986c 100644 --- a/TAO/TAO_IDL/include/utl_scope.h +++ b/TAO/TAO_IDL/include/utl_scope.h @@ -229,8 +229,8 @@ public: // Name Lookup Mechanism AST_Decl *lookup_by_name (UTL_ScopedName *, - idl_bool treat_as_ref, - idl_bool in_parent = 1); + bool treat_as_ref, + bool in_parent = 1); // Look up the Identifier * specified only in the local scope. AST_Decl *lookup_by_name_local (Identifier *, @@ -261,8 +261,8 @@ public: void add_to_name_referenced (Identifier *id); // Accessors for the has_prefix_ member. - idl_bool has_prefix (void); - void has_prefix (idl_bool val); + bool has_prefix (void); + void has_prefix (bool val); // Cleanup function. virtual void destroy (void); @@ -289,37 +289,37 @@ protected: // If ex is not 0 'e' will be inserted at the position // after ex, which is already in the list. void add_to_referenced (AST_Decl *e, - idl_bool recursive, + bool recursive, Identifier *id, AST_Decl *ex = 0); - + // Add to local types. Node represents a local manifest type. void add_to_local_types (AST_Decl *e); // Has this node been referenced here already? - virtual idl_bool referenced (AST_Decl *e, + virtual bool referenced (AST_Decl *e, Identifier *id = 0); // Look up a scoped name in the inherited list. virtual AST_Decl *look_in_inherited (UTL_ScopedName *, - idl_bool treat_as_ref); - + bool treat_as_ref); + // Look up a scoped name in the supported interface list. virtual AST_Decl *look_in_supported (UTL_ScopedName *, - idl_bool treat_as_ref); - + bool treat_as_ref); + // Lookup based on the local name. AST_Decl *lookup_for_add (AST_Decl *d, - idl_bool treat_as_ref); + bool treat_as_ref); // Is there a (case-insensitive) clash between a local name // and an IDL keyword? int idl_keyword_clash (Identifier *e); // Checks for modules, or defns of forward declared struct or unions. - idl_bool redef_clash (AST_Decl::NodeType new_nt, + bool redef_clash (AST_Decl::NodeType new_nt, AST_Decl::NodeType scope_elem_nt); - + void check_for_predef_seq (AST_Decl *d); // Set the appropriate *_seen_ flag if we are seeing a spec-defined // sequence of a basic type. @@ -354,7 +354,7 @@ protected: long pd_name_referenced_used; // How many used? // Have we seen a #pragma prefix declaration in this scope? - idl_bool has_prefix_; + bool has_prefix_; // Friend class UTL_ScopeActiveIterator defines active iterator for // UTL_Scope. Definition follows below. @@ -450,7 +450,7 @@ public: AST_Decl *item (void); // Have we iterated over entire scope? - idl_bool is_done (void); + bool is_done (void); // What kind of iterator is this? UTL_Scope::ScopeIterationKind iteration_kind (void); diff --git a/TAO/TAO_IDL/include/utl_string.h b/TAO/TAO_IDL/include/utl_string.h index 2b98d823525..ff470c900ae 100644 --- a/TAO/TAO_IDL/include/utl_string.h +++ b/TAO/TAO_IDL/include/utl_string.h @@ -68,7 +68,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #define _STRING_STRING_HH #include "TAO_IDL_FE_Export.h" -#include "idl_bool.h" + #include "ace/iosfwd.h" /* Basic_Types.h are needed in QNX for size_t type. */ #include "ace/Basic_Types.h" @@ -98,7 +98,7 @@ public: // Get canonical representation. This is (implemented as) the all upper // case corresponding string. - idl_bool compare (UTL_String *s); + bool compare (UTL_String *s); // Compare two UTL_String * long compare_quiet (UTL_String *s); diff --git a/TAO/TAO_IDL/include/utl_tmpl/utl_exceptlist.h b/TAO/TAO_IDL/include/utl_tmpl/utl_exceptlist.h index 8fee4504360..ea4f418a276 100644 --- a/TAO/TAO_IDL/include/utl_tmpl/utl_exceptlist.h +++ b/TAO/TAO_IDL/include/utl_tmpl/utl_exceptlist.h @@ -79,7 +79,7 @@ #include "utl_identifier.h" #include "utl_string.h" #include "ast_expression.h" -#include "idl_bool.h" +#include "bool.h" #include "utl_scope.h" #include "ast_decl.h" #include "ast_type.h" diff --git a/TAO/TAO_IDL/tao_idl.cpp b/TAO/TAO_IDL/tao_idl.cpp index 343b341be0f..54ea445086e 100644 --- a/TAO/TAO_IDL/tao_idl.cpp +++ b/TAO/TAO_IDL/tao_idl.cpp @@ -108,11 +108,11 @@ DRV_init (int &argc, char *argv[]) { // Initialize BE. FE_init (); - + // Initialize driver private data DRV_nfiles = 0; DRV_file_index = 0; - + #if defined (TAO_IDL_PREPROCESSOR) idl_global->set_cpp_location (TAO_IDL_PREPROCESSOR); #elif defined (ACE_CC_PREPROCESSOR) @@ -140,8 +140,8 @@ DRV_refresh (void) idl_global->set_main_filename (0); idl_global->set_real_filename (0); idl_global->set_stripped_filename (0); -// idl_global->set_import (I_TRUE); -// idl_global->set_in_main_file (I_FALSE); +// idl_global->set_import (true); +// idl_global->set_in_main_file (false); idl_global->set_lineno (-1); idl_global->reset_flag_seen (); } @@ -195,7 +195,7 @@ DRV_drive (const char *s) } FE_yyparse (); - + // We must do this as late as possible to make sure any // forward declared structs or unions contained in a // primary key at some level have been fully defined. @@ -264,7 +264,7 @@ DRV_drive (const char *s) { ACE_OS::exit (static_cast<int> (error_count)); } - + DRV_refresh (); } @@ -305,7 +305,7 @@ main (int argc, char *argv[]) ACE_OS::exit (0); } - // If there are no input files, and we are not using the + // If there are no input files, and we are not using the // directory recursion option, there's no sense going any further. if (DRV_nfiles == 0 && idl_global->recursion_start () == 0) { @@ -330,7 +330,7 @@ main (int argc, char *argv[]) else { idl_global->set_gen (gen); - } + } // Initialize AST and load predefined types. FE_populate (); @@ -344,12 +344,12 @@ main (int argc, char *argv[]) { DRV_drive (DRV_files[DRV_file_index]); } - - be_global->destroy (); + + be_global->destroy (); delete be_global; be_global = 0; - - idl_global->fini (); + + idl_global->fini (); delete idl_global; idl_global = 0; @@ -359,7 +359,7 @@ main (int argc, char *argv[]) { ACE::strdelete (const_cast<char *> (DRV_files[DRV_file_index])); } - + ACE_OS::exit (0); // NOT REACHED diff --git a/TAO/TAO_IDL/util/utl_global.cpp b/TAO/TAO_IDL/util/utl_global.cpp index f6372e8dc8a..e5cf61a0df2 100644 --- a/TAO/TAO_IDL/util/utl_global.cpp +++ b/TAO/TAO_IDL/util/utl_global.cpp @@ -104,8 +104,8 @@ IDL_GlobalData::IDL_GlobalData (void) pd_main_filename (0), pd_real_filename (0), pd_stripped_filename (0), - pd_import (I_FALSE), - pd_in_main_file (I_FALSE), + pd_import (false), + pd_in_main_file (false), pd_prog_name (0), pd_cpp_location (0), pd_compile_flags (0), @@ -123,11 +123,11 @@ IDL_GlobalData::IDL_GlobalData (void) gperf_path_ (0), temp_dir_ (0), ident_string_ (0), - case_diff_error_ (I_TRUE), - nest_orb_ (I_FALSE), + case_diff_error_ (true), + nest_orb_ (false), idl_flags_ (""), - preserve_cpp_keywords_ (I_TRUE), - pass_orb_idl_ (I_FALSE), + preserve_cpp_keywords_ (true), + pass_orb_idl_ (false), using_ifr_backend_ (false), ignore_idl3_ (false), recursion_start_ (0) // Not used by all backends. @@ -402,33 +402,33 @@ IDL_GlobalData::set_real_filename (UTL_String *n) } // Get or set indicator whether import is on -idl_bool +bool IDL_GlobalData::imported (void) { - return this->pd_in_main_file ? I_FALSE : pd_import; + return this->pd_in_main_file ? false : pd_import; } -idl_bool +bool IDL_GlobalData::import (void) { return this->pd_import; } void -IDL_GlobalData::set_import (idl_bool is_in) +IDL_GlobalData::set_import (bool is_in) { this->pd_import = is_in; } // Get or set indicator whether we're reading the main file now -idl_bool +bool IDL_GlobalData::in_main_file (void) { return this->pd_in_main_file; } void -IDL_GlobalData::set_in_main_file (idl_bool is_in) +IDL_GlobalData::set_in_main_file (bool is_in) { this->pd_in_main_file = is_in; } @@ -974,24 +974,24 @@ IDL_GlobalData::ident_string (void) const } void -IDL_GlobalData::case_diff_error (idl_bool val) +IDL_GlobalData::case_diff_error (bool val) { this->case_diff_error_ = val; } -idl_bool +bool IDL_GlobalData::case_diff_error (void) { return this->case_diff_error_; } void -IDL_GlobalData::nest_orb (idl_bool val) +IDL_GlobalData::nest_orb (bool val) { this->nest_orb_ = val; } -idl_bool +bool IDL_GlobalData::nest_orb (void) { return this->nest_orb_; @@ -1064,7 +1064,7 @@ IDL_GlobalData::destroy (void) this->n_included_idl_files_ = 0; this->pd_root->destroy (); - + ACE::strdelete (this->recursion_start_); this->recursion_start_ = 0; } @@ -1290,7 +1290,7 @@ IDL_GlobalData::stripped_preproc_include (const char *name) C++ keywords e.g. delete, operator etc. with _cxx_ prefix. Should be true when being used by the IFR Service */ -idl_bool +bool IDL_GlobalData::preserve_cpp_keywords (void) { return preserve_cpp_keywords_; @@ -1302,7 +1302,7 @@ IDL_GlobalData::preserve_cpp_keywords (void) Is unset by the tao_idl compiler. */ void -IDL_GlobalData::preserve_cpp_keywords (idl_bool val) +IDL_GlobalData::preserve_cpp_keywords (bool val) { preserve_cpp_keywords_ = val; } @@ -1319,14 +1319,14 @@ IDL_GlobalData::file_prefixes (void) return this->file_prefixes_; } -idl_bool +bool IDL_GlobalData::pass_orb_idl (void) const { return this->pass_orb_idl_; } void -IDL_GlobalData::pass_orb_idl (idl_bool val) +IDL_GlobalData::pass_orb_idl (bool val) { this->pass_orb_idl_ = val; } @@ -1519,7 +1519,7 @@ IDL_GlobalData::create_uses_multiple_stuff ( UTL_ScopedName scoped_name (&module_id, &local_name); AST_Decl *d = c->lookup_by_name (&scoped_name, - I_TRUE); + true); local_id.destroy (); module_id.destroy (); @@ -1617,9 +1617,9 @@ void IDL_GlobalData::check_primary_keys (void) { AST_ValueType *holder = 0; - + while (!this->primary_keys_.is_empty ()) - { + { // Dequeue the element at the head of the queue. if (this->primary_keys_.dequeue_head (holder)) { @@ -1686,7 +1686,7 @@ IDL_GlobalData::add_dcps_data_type(const char* id) } -idl_bool +bool IDL_GlobalData::add_dcps_data_key(const char* id, const char* key) { // Search the map for the type. diff --git a/TAO/TAO_IDL/util/utl_identifier.cpp b/TAO/TAO_IDL/util/utl_identifier.cpp index c12115c8e1b..f993627e94e 100644 --- a/TAO/TAO_IDL/util/utl_identifier.cpp +++ b/TAO/TAO_IDL/util/utl_identifier.cpp @@ -72,8 +72,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc. // FUZZ: disable check_for_streams_include #include "ace/streams.h" -ACE_RCSID (util, - utl_identifier, +ACE_RCSID (util, + utl_identifier, "$Id$") Identifier::Identifier (void) @@ -84,7 +84,7 @@ Identifier::Identifier (void) Identifier::Identifier (const char *s) { - idl_bool shift = 0; + bool shift = 0; this->escaped_ = 0; if (*s == '_') @@ -149,35 +149,35 @@ Identifier::replace_string (const char * s) } // Compare two Identifier * -long +bool Identifier::compare (Identifier *o) { if (o == 0) { - return I_FALSE; + return false; }; if (this->pv_string == 0 || o->get_string () == 0) { - return I_FALSE; + return false; } if (this->escaped_ ^ o->escaped_) { - return I_FALSE; + return false; } return (ACE_OS::strcmp (this->pv_string, o->get_string ()) == 0); } // Report the appropriate error if the two identifiers differ only in case. -long +bool Identifier::case_compare (Identifier *o) { UTL_String member (this->pv_string); UTL_String other (o->get_string ()); - long result = member.compare (&other); + bool result = member.compare (&other); member.destroy (); other.destroy (); @@ -186,13 +186,13 @@ Identifier::case_compare (Identifier *o) } // Report no error if the two identifiers differ only in case. -long +bool Identifier::case_compare_quiet (Identifier *o) { UTL_String member (this->pv_string); UTL_String other (o->pv_string); - long result = member.compare_quiet (&other); + bool result = member.compare_quiet (&other); member.destroy (); other.destroy (); @@ -213,7 +213,7 @@ Identifier::copy (void) return retval; } -idl_bool +bool Identifier::escaped (void) const { return this->escaped_; diff --git a/TAO/TAO_IDL/util/utl_idlist.cpp b/TAO/TAO_IDL/util/utl_idlist.cpp index 194c57a7f1c..26985395686 100644 --- a/TAO/TAO_IDL/util/utl_idlist.cpp +++ b/TAO/TAO_IDL/util/utl_idlist.cpp @@ -68,9 +68,9 @@ trademarks or registered trademarks of Sun Microsystems, Inc. // NOTE: This list class only works correctly because we use single public // inheritance, as opposed to multiple inheritance or public virtual. -// It relies on a type-unsafe cast from UTL_List to subclasses, which -// will cease to operate correctly if you use either multiple or -// public virtual inheritance. +// It relies on a type-unsafe cast from UTL_List to subclasses, which +// will cease to operate correctly if you use either multiple or +// public virtual inheritance. #include "utl_idlist.h" #include "utl_identifier.h" @@ -80,8 +80,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc. // FUZZ: disable check_for_streams_include #include "ace/streams.h" -ACE_RCSID (util, - utl_idlist, +ACE_RCSID (util, + utl_idlist, "$Id$") // Constructor @@ -164,7 +164,7 @@ UTL_IdList::compare (UTL_IdList *other) { return 1; } - + return ((UTL_IdList *) this_tail)->compare (other); } @@ -210,8 +210,8 @@ UTL_IdList::compare (UTL_IdList *other) void UTL_IdList::dump (ACE_OSTREAM_TYPE &o) { - long first = I_TRUE; - long second = I_FALSE; + long first = true; + long second = false; for (UTL_IdListActiveIterator i (this); !i.is_done (); @@ -223,7 +223,7 @@ UTL_IdList::dump (ACE_OSTREAM_TYPE &o) } else if (second) { - first = second = I_FALSE; + first = second = false; } i.item ()->dump (o); @@ -232,11 +232,11 @@ UTL_IdList::dump (ACE_OSTREAM_TYPE &o) { if (ACE_OS::strcmp (i.item ()->get_string (), "::") != 0) { - first = I_FALSE; + first = false; } else { - second = I_TRUE; + second = true; } } } diff --git a/TAO/TAO_IDL/util/utl_list.cpp b/TAO/TAO_IDL/util/utl_list.cpp index 9cdc10ea09b..1e1f23a0657 100644 --- a/TAO/TAO_IDL/util/utl_list.cpp +++ b/TAO/TAO_IDL/util/utl_list.cpp @@ -68,19 +68,19 @@ trademarks or registered trademarks of Sun Microsystems, Inc. // NOTE: This list class only works correctly because we use single public // inheritance, as opposed to multiple inheritance or public virtual. -// It relies on a type-unsafe cast from UTL_List to subclasses, which -// will cease to operate correctly if you use either multiple or -// public virtual inheritance. +// It relies on a type-unsafe cast from UTL_List to subclasses, which +// will cease to operate correctly if you use either multiple or +// public virtual inheritance. #include "utl_list.h" #include "ace/OS_Memory.h" -ACE_RCSID (util, - utl_list, +ACE_RCSID (util, + utl_list, "$Id$") UTL_List::UTL_List (UTL_List *c) - : pd_cdr_data (c) + : pd_cdr_data (c) { } @@ -179,10 +179,10 @@ UTL_ListActiveIterator::UTL_ListActiveIterator (UTL_List *s) } // Is iterator done? -idl_bool +bool UTL_ListActiveIterator::is_done (void) { - return (this->source == 0) ? I_TRUE : I_FALSE; + return (this->source == 0) ? true : false; } // Advance to next item. diff --git a/TAO/TAO_IDL/util/utl_namelist.cpp b/TAO/TAO_IDL/util/utl_namelist.cpp index a15ebd3f200..e88da13f0f0 100644 --- a/TAO/TAO_IDL/util/utl_namelist.cpp +++ b/TAO/TAO_IDL/util/utl_namelist.cpp @@ -68,21 +68,21 @@ trademarks or registered trademarks of Sun Microsystems, Inc. // NOTE: This list class only works correctly because we use single public // inheritance, as opposed to multiple inheritance or public virtual. -// It relies on a type-unsafe cast from UTL_List to subclasses, which -// will cease to operate correctly if you use either multiple or -// public virtual inheritance. +// It relies on a type-unsafe cast from UTL_List to subclasses, which +// will cease to operate correctly if you use either multiple or +// public virtual inheritance. #include "utl_namelist.h" -ACE_RCSID (util, - utl_namelist, +ACE_RCSID (util, + utl_namelist, "$Id$") -UTL_NameList::UTL_NameList (UTL_ScopedName *s, +UTL_NameList::UTL_NameList (UTL_ScopedName *s, UTL_NameList *cdr) - : UTL_List (cdr), - pd_car_data (s), - pd_truncatable (I_FALSE) + : UTL_List (cdr), + pd_car_data (s), + pd_truncatable (false) { } @@ -93,20 +93,20 @@ UTL_NameList::head (void) return this->pd_car_data; } -idl_bool +bool UTL_NameList::truncatable (void) const { return this->pd_truncatable; } void -UTL_NameList::truncatable (idl_bool val) +UTL_NameList::truncatable (bool val) { this->pd_truncatable = val; } UTL_NamelistActiveIterator::UTL_NamelistActiveIterator (UTL_NameList *s) - : UTL_ListActiveIterator(s) + : UTL_ListActiveIterator(s) { } diff --git a/TAO/TAO_IDL/util/utl_scope.cpp b/TAO/TAO_IDL/util/utl_scope.cpp index 543de88d622..ac011b7d84f 100644 --- a/TAO/TAO_IDL/util/utl_scope.cpp +++ b/TAO/TAO_IDL/util/utl_scope.cpp @@ -347,7 +347,7 @@ add_type (AST_Type *type) // be used only by the CFE add_xxx functions. AST_Decl * UTL_Scope::lookup_for_add (AST_Decl *d, - idl_bool) + bool) { if (d == 0) { @@ -402,7 +402,7 @@ UTL_Scope::idl_keyword_clash (Identifier *e) return 0; } -idl_bool +bool UTL_Scope::redef_clash (AST_Decl::NodeType new_nt, AST_Decl::NodeType scope_elem_nt) { @@ -437,7 +437,7 @@ UTL_Scope::redef_clash (AST_Decl::NodeType new_nt, return (scope_elem_nt != AST_Decl::NT_eventtype_fwd && scope_elem_nt != AST_Decl::NT_eventtype); default: - return I_TRUE; + return true; } } @@ -455,7 +455,7 @@ UTL_Scope::check_for_predef_seq (AST_Decl *d) AST_Type *bt = 0; AST_Decl::NodeType nt = d->node_type (); - + // We are interested only in members, arguments and typedefs. switch (nt) { @@ -471,33 +471,33 @@ UTL_Scope::check_for_predef_seq (AST_Decl *d) default: return; } - + // Check to eliminate more candidates. if (!bt->imported () || bt->node_type () != AST_Decl::NT_typedef) { return; } - - bt = AST_Typedef::narrow_from_decl (bt)->base_type (); + + bt = AST_Typedef::narrow_from_decl (bt)->base_type (); nt = bt->node_type (); - + // Must be a sequence with only one level of typedef. if (nt != AST_Decl::NT_sequence) { return; } - - // Must be defined in the CORBA module. + + // Must be defined in the CORBA module. AST_Decl *p = ScopeAsDecl (bt->defined_in ()); if (ACE_OS::strcmp (p->local_name ()->get_string (), "CORBA") != 0) { return; } - - // We know this narrowing will be successful. + + // We know this narrowing will be successful. bt = AST_Sequence::narrow_from_decl (bt)->base_type (); nt = bt->node_type (); - + // First check for string or wstring base type. if (nt == AST_Decl::NT_string) { @@ -509,14 +509,14 @@ UTL_Scope::check_for_predef_seq (AST_Decl *d) idl_global->wstring_seq_seen_ = true; return; } - + // Now check for predefined base type. AST_PredefinedType *pdt = AST_PredefinedType::narrow_from_decl (bt); if (pdt == 0) { return; } - + switch (pdt->pt ()) { case AST_PredefinedType::PT_long: @@ -582,7 +582,7 @@ UTL_Scope::add_predefined_type (AST_PredefinedType *p) return 0; } - p->set_added (I_TRUE); + p->set_added (true); return p; } @@ -594,7 +594,7 @@ UTL_Scope::add_module (AST_Module *m) return 0; } - m->set_added (I_TRUE); + m->set_added (true); return m; } @@ -606,7 +606,7 @@ UTL_Scope::add_interface (AST_Interface *i) return 0; } - i->set_added (I_TRUE); + i->set_added (true); return i; } @@ -618,7 +618,7 @@ UTL_Scope::add_interface_fwd (AST_InterfaceFwd *i) return 0; } - i->set_added (I_TRUE); + i->set_added (true); return i; } @@ -630,7 +630,7 @@ UTL_Scope::add_valuetype (AST_ValueType *i) return 0; } - i->set_added (I_TRUE); + i->set_added (true); return i; } @@ -642,7 +642,7 @@ UTL_Scope::add_valuetype_fwd (AST_ValueTypeFwd *i) return 0; } - i->set_added (I_TRUE); + i->set_added (true); return i; } @@ -654,7 +654,7 @@ UTL_Scope::add_eventtype (AST_EventType *i) return 0; } - i->set_added (I_TRUE); + i->set_added (true); return i; } @@ -666,7 +666,7 @@ UTL_Scope::add_eventtype_fwd (AST_EventTypeFwd *i) return 0; } - i->set_added (I_TRUE); + i->set_added (true); return i; } @@ -678,7 +678,7 @@ UTL_Scope::add_component (AST_Component *i) return 0; } - i->set_added (I_TRUE); + i->set_added (true); return i; } @@ -690,7 +690,7 @@ UTL_Scope::add_component_fwd (AST_ComponentFwd *i) return 0; } - i->set_added (I_TRUE); + i->set_added (true); return i; } @@ -702,7 +702,7 @@ UTL_Scope::add_home (AST_Home *i) return 0; } - i->set_added (I_TRUE); + i->set_added (true); return i; } @@ -714,7 +714,7 @@ UTL_Scope::add_exception (AST_Exception *e) return 0; } - e->set_added (I_TRUE); + e->set_added (true); return e; } @@ -726,7 +726,7 @@ UTL_Scope::add_constant (AST_Constant *c) return 0; } - c->set_added (I_TRUE); + c->set_added (true); return c; } @@ -750,7 +750,7 @@ UTL_Scope::add_attribute (AST_Attribute *a) return 0; } - a->set_added (I_TRUE); + a->set_added (true); if (!a->field_type ()->added ()) { @@ -770,7 +770,7 @@ UTL_Scope::add_operation (AST_Operation *o) return 0; } - o->set_added (I_TRUE); + o->set_added (true); if (!o->return_type ()->added ()) { @@ -790,7 +790,7 @@ UTL_Scope::add_argument (AST_Argument *a) return 0; } - a->set_added (I_TRUE); + a->set_added (true); if (!a->field_type ()->added ()) { @@ -810,7 +810,7 @@ UTL_Scope::add_union (AST_Union *u) return 0; } - u->set_added (I_TRUE); + u->set_added (true); return u; } @@ -822,7 +822,7 @@ UTL_Scope::add_union_fwd (AST_UnionFwd *u) return 0; } - u->set_added (I_TRUE); + u->set_added (true); return u; } @@ -834,7 +834,7 @@ UTL_Scope::add_union_branch (AST_UnionBranch *u) return 0; } - u->set_added (I_TRUE); + u->set_added (true); if (!u->field_type ()->added ()) { @@ -854,7 +854,7 @@ UTL_Scope::add_structure (AST_Structure *s) return 0; } - s->set_added (I_TRUE); + s->set_added (true); return s; } @@ -866,7 +866,7 @@ UTL_Scope::add_structure_fwd (AST_StructureFwd *s) return 0; } - s->set_added (I_TRUE); + s->set_added (true); return s; } @@ -878,7 +878,7 @@ UTL_Scope::add_field (AST_Field *f) return 0; } - f->set_added (I_TRUE); + f->set_added (true); if (!f->field_type ()->added ()) { @@ -898,7 +898,7 @@ UTL_Scope::add_enum (AST_Enum *e) return 0; } - e->set_added (I_TRUE); + e->set_added (true); return e; } @@ -910,7 +910,7 @@ UTL_Scope::add_enum_val (AST_EnumVal *e) return 0; } - e->set_added (I_TRUE); + e->set_added (true); return e; } @@ -922,7 +922,7 @@ UTL_Scope::add_typedef (AST_Typedef *t) return 0; } - t->set_added (I_TRUE); + t->set_added (true); if (!t->base_type ()->added ()) { return add_type (t->base_type ()) ? t : 0; @@ -941,7 +941,7 @@ UTL_Scope::add_sequence (AST_Sequence *s) return 0; } - s->set_added (I_TRUE); + s->set_added (true); if (!s->base_type ()->added ()) { @@ -961,7 +961,7 @@ UTL_Scope::add_string (AST_String *s) return 0; } - s->set_added (I_TRUE); + s->set_added (true); return s; } @@ -973,7 +973,7 @@ UTL_Scope::add_array (AST_Array *a) return 0; } - a->set_added (I_TRUE); + a->set_added (true); if (!a->base_type ()->added ()) { @@ -993,7 +993,7 @@ UTL_Scope::add_native (AST_Native *n) return 0; } - n->set_added (I_TRUE); + n->set_added (true); return n; } @@ -1006,7 +1006,7 @@ UTL_Scope::add_factory (AST_Factory *f) return 0; } - f->set_added (I_TRUE); + f->set_added (true); return f; } @@ -1341,17 +1341,17 @@ UTL_Scope::lookup_pseudo (Identifier *e) AST_Decl *d = 0; UTL_ScopeActiveIterator *i = 0; char *name_string = e->get_string (); - idl_bool tc_lookup = I_FALSE; - idl_bool obj_lookup = I_FALSE; - idl_bool vb_lookup = I_FALSE; + bool tc_lookup = false; + bool obj_lookup = false; + bool vb_lookup = false; if (ACE_OS::strcasecmp (name_string, "Object") == 0) { - obj_lookup = I_TRUE; + obj_lookup = true; } else if (ACE_OS::strcasecmp (name_string, "ValueBase") == 0) { - vb_lookup = I_TRUE; + vb_lookup = true; } if (obj_lookup || vb_lookup) @@ -1374,7 +1374,7 @@ UTL_Scope::lookup_pseudo (Identifier *e) UTL_ScopeActiveIterator (this, UTL_Scope::IK_decls), 0); - tc_lookup = I_TRUE; + tc_lookup = true; } else { @@ -1562,7 +1562,7 @@ UTL_Scope::lookup_primitive_type (AST_Expression::ExprType et) // Look through inherited list. Overridden in AST_Interface. AST_Decl * UTL_Scope::look_in_inherited (UTL_ScopedName *, - idl_bool ) + bool ) { return 0; } @@ -1570,7 +1570,7 @@ UTL_Scope::look_in_inherited (UTL_ScopedName *, // Look through supported interface list. Overridden where necessary. AST_Decl * UTL_Scope::look_in_supported (UTL_ScopedName *, - idl_bool) + bool) { return 0; } @@ -1600,7 +1600,7 @@ UTL_Scope::lookup_by_name_local (Identifier *e, Identifier *item_name = 0; - idl_bool in_corba = + bool in_corba = ACE_OS::strcmp (e->get_string (), "CORBA") == 0; // Iterate over this scope. We need IK_both here for the legacy @@ -1687,8 +1687,8 @@ UTL_Scope::lookup_by_name_local (Identifier *e, // Implements lookup by name for scoped names. AST_Decl * UTL_Scope::lookup_by_name (UTL_ScopedName *e, - idl_bool treat_as_ref, - idl_bool in_parent) + bool treat_as_ref, + bool in_parent) { AST_Decl *d = 0; UTL_Scope *t = 0; @@ -1734,7 +1734,7 @@ UTL_Scope::lookup_by_name (UTL_ScopedName *e, if (treat_as_ref && d != 0) { add_to_referenced (d, - I_FALSE, + false, 0); } @@ -1755,7 +1755,7 @@ UTL_Scope::lookup_by_name (UTL_ScopedName *e, { // A no-op unless d can inherit. d = look_in_inherited (e, treat_as_ref); - + if (d == 0) { // A no-op unless d can support interfaces. @@ -1813,7 +1813,7 @@ UTL_Scope::lookup_by_name (UTL_ScopedName *e, && nt != AST_Decl::NT_root) { s->add_to_referenced (d, - I_FALSE, + false, d->local_name ()); s = parent->defined_in (); @@ -1858,7 +1858,7 @@ UTL_Scope::lookup_by_name (UTL_ScopedName *e, if (treat_as_ref && d != 0) { add_to_referenced (d, - I_FALSE, + false, 0); } @@ -1877,7 +1877,7 @@ UTL_Scope::lookup_by_name (UTL_ScopedName *e, // Add a node to set of nodes referenced in this scope. void UTL_Scope::add_to_referenced (AST_Decl *e, - idl_bool recursive, + bool recursive, Identifier *id, AST_Decl *ex) { @@ -1914,8 +1914,8 @@ UTL_Scope::add_to_referenced (AST_Decl *e, { return; } - - // Sets the appropriate *_seen_ flag for future use. + + // Sets the appropriate *_seen_ flag for future use. this->check_for_predef_seq (e); // Make sure there's space for one more decl. @@ -1954,7 +1954,7 @@ UTL_Scope::add_to_referenced (AST_Decl *e, break; } } - + if (this->pd_referenced_used > 0) { ++this->pd_referenced_used; @@ -2077,8 +2077,8 @@ UTL_Scope::add_to_scope (AST_Decl *e, AST_Decl::NodeType new_nt = e->node_type (); AST_Decl::NodeType scope_elem_nt = (*tmp)->node_type (); - if (decl_name->compare (ref_name) == I_TRUE - && this->redef_clash (new_nt, scope_elem_nt) == I_TRUE) + if (decl_name->compare (ref_name) == true + && this->redef_clash (new_nt, scope_elem_nt) == true) { idl_global->err ()->redef_error (decl_string, ref_string); @@ -2088,7 +2088,7 @@ UTL_Scope::add_to_scope (AST_Decl *e, } // If the spellings differ only by case, it's also an error, // unless one, but not both of the identifiers were escaped. - else if (decl_name->case_compare_quiet (ref_name) == I_TRUE + else if (decl_name->case_compare_quiet (ref_name) == true && !(decl_name->escaped () ^ ref_name->escaped ())) { if (idl_global->case_diff_error ()) @@ -2120,7 +2120,7 @@ UTL_Scope::add_to_scope (AST_Decl *e, { Identifier *parent_name = d->local_name (); - if (decl_name->compare (parent_name) == I_TRUE) + if (decl_name->compare (parent_name) == true) { idl_global->err ()->redef_error ( decl_name->get_string (), @@ -2130,7 +2130,7 @@ UTL_Scope::add_to_scope (AST_Decl *e, // if we try to continue from here, we risk a crash. ACE_OS::exit (99); } - else if (decl_name->case_compare_quiet (parent_name) == I_TRUE) + else if (decl_name->case_compare_quiet (parent_name) == true) { if (idl_global->case_diff_error ()) { @@ -2138,7 +2138,7 @@ UTL_Scope::add_to_scope (AST_Decl *e, decl_name->get_string (), parent_name->get_string () ); - + // if we try to continue from here, we risk a crash. ACE_OS::exit (99); } @@ -2229,7 +2229,7 @@ UTL_Scope::add_to_local_types (AST_Decl *e) } // Has this node been referenced here before? -idl_bool +bool UTL_Scope::referenced (AST_Decl *e, Identifier *id) { @@ -2243,22 +2243,22 @@ UTL_Scope::referenced (AST_Decl *e, // Same node? if (*tmp == e) { - return I_TRUE; + return true; } // Are we definging a forward declared struct, union, or interface, // or reopening a module? - idl_bool forward_redef = this->redef_clash (e->node_type (), + bool forward_redef = this->redef_clash (e->node_type (), (*tmp)->node_type ()); - if (forward_redef == I_FALSE) + if (forward_redef == false) { member = (*tmp)->local_name (); test = e->local_name (); - if (member->compare (test) == I_TRUE) + if (member->compare (test) == true) { - return I_FALSE; + return false; } } } @@ -2282,17 +2282,17 @@ UTL_Scope::referenced (AST_Decl *e, // scope, then it's a type name for something else // that was, and it can appear any number of times // in this scope without a clash. - if (id->compare (*name_tmp) == I_TRUE + if (id->compare (*name_tmp) == true && e->node_type () != AST_Decl::NT_module && e->defined_in () == this) { idl_global->err ()->redef_error (id->get_string (), (*name_tmp)->get_string ()); - return I_TRUE; + return true; } // No clash if one or the other of the identifiers was escaped. - else if (id->case_compare_quiet (*name_tmp) == I_TRUE + else if (id->case_compare_quiet (*name_tmp) == true && !(id->escaped () ^ (*name_tmp)->escaped ())) { if (idl_global->case_diff_error ()) @@ -2310,23 +2310,23 @@ UTL_Scope::referenced (AST_Decl *e, ); } - return I_TRUE; + return true; } } } // Not found - return I_FALSE; + return false; } -idl_bool +bool UTL_Scope::has_prefix (void) { return this->has_prefix_; } void -UTL_Scope::has_prefix (idl_bool val) +UTL_Scope::has_prefix (bool val) { this->has_prefix_ = val; } @@ -2480,7 +2480,7 @@ UTL_ScopeActiveIterator::item (void) } // Is this iteration done? -idl_bool +bool UTL_ScopeActiveIterator::is_done (void) { long limit = @@ -2493,19 +2493,19 @@ UTL_ScopeActiveIterator::is_done (void) // Last element? if (this->il < limit) { - return I_FALSE; + return false; } // Only want decls? if (this->stage == UTL_Scope::IK_decls) { - return I_TRUE; + return true; } // Already done local types? if (this->ik == UTL_Scope::IK_localtypes) { - return I_TRUE; + return true; } // Switch to next stage. diff --git a/TAO/TAO_IDL/util/utl_stack.cpp b/TAO/TAO_IDL/util/utl_stack.cpp index 31a3393b7c7..a5b1b944b12 100644 --- a/TAO/TAO_IDL/util/utl_stack.cpp +++ b/TAO/TAO_IDL/util/utl_stack.cpp @@ -68,19 +68,19 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "utl_scope.h" #include "global_extern.h" -ACE_RCSID (util, - utl_stack, +ACE_RCSID (util, + utl_stack, "$Id$") -#undef INCREMENT -#define INCREMENT 64 +#undef INCREMENT +#define INCREMENT 64 UTL_ScopeStack::UTL_ScopeStack (void) : pd_stack_data_nalloced (INCREMENT), pd_stack_top (0) { ACE_NEW (this->pd_stack_data, - UTL_Scope *[INCREMENT]); + UTL_Scope *[INCREMENT]); } UTL_ScopeStack::~UTL_ScopeStack (void) @@ -95,7 +95,7 @@ UTL_ScopeStack::~UTL_ScopeStack (void) UTL_ScopeStack * UTL_ScopeStack::push (UTL_Scope *el) { - UTL_Scope **tmp; + UTL_Scope **tmp; long ostack_data_nalloced; long i; @@ -187,18 +187,18 @@ UTL_ScopeStack::depth (void) UTL_Scope * UTL_ScopeStack::next_to_top (void) { - UTL_Scope *tmp, *retval; + UTL_Scope *tmp, *retval; if (this->depth () < 2) { return 0; } - tmp = top (); // Save top - (void) pop (); // Pop it - retval = top (); // Get next one down - (void) push (tmp); // Push top back - return retval; // Return next one down + tmp = top (); // Save top + (void) pop (); // Pop it + retval = top (); // Get next one down + (void) push (tmp); // Push top back + return retval; // Return next one down } // Return topmost non-NULL element. @@ -217,8 +217,8 @@ UTL_ScopeStack::top_non_null (void) } UTL_ScopeStackActiveIterator::UTL_ScopeStackActiveIterator (UTL_ScopeStack &s) - : source (s), - il (s.pd_stack_top - 1) + : source (s), + il (s.pd_stack_top - 1) { } @@ -247,9 +247,9 @@ UTL_ScopeStackActiveIterator::is_done (void) { if (this->il >= 0) { - return I_FALSE; + return false; } - return I_TRUE; + return true; } diff --git a/TAO/TAO_IDL/util/utl_string.cpp b/TAO/TAO_IDL/util/utl_string.cpp index 79543a40b51..067f26d0820 100644 --- a/TAO/TAO_IDL/util/utl_string.cpp +++ b/TAO/TAO_IDL/util/utl_string.cpp @@ -155,36 +155,36 @@ UTL_String::canonicalize (void) } // Compare two UTL_String *. -idl_bool +bool UTL_String::compare (UTL_String *s) { char *s_c_str; - long result; + bool result; if (this->c_str == 0 || s == 0 || (s_c_str = s->get_canonical_rep ()) == 0) { - result = I_FALSE; + result = false; } else { result = - (ACE_OS::strcmp (this->c_str, s_c_str) == 0) ? I_TRUE : I_FALSE; + (ACE_OS::strcmp (this->c_str, s_c_str) == 0) ? true : false; } // Check that the names are typed consistently. - if (result == I_TRUE + if (result == true && ACE_OS::strcmp (this->p_str, s->get_string ()) != 0) { // Prevents redundant error reporting if we're in this branch. - result = I_FALSE; + result = false; if (idl_global->case_diff_error ()) { idl_global->err ()->name_case_error (this->p_str, s->get_string ()); - + // if we try to continue from here, we risk a crash. ACE_OS::exit (99); } @@ -208,19 +208,19 @@ UTL_String::compare_quiet (UTL_String *s) || s == 0 || (s_c_str = s->get_canonical_rep ()) == 0) { - result = I_FALSE; + result = false; } else if (ACE_OS::strcmp (this->c_str, s_c_str) != 0) { - result = I_FALSE; + result = false; } else if (ACE_OS::strcmp (this->p_str, s->get_string ()) != 0) { - result = I_TRUE; + result = true; } else { - result = I_FALSE; + result = false; } return result; diff --git a/TAO/TAO_IDL/util/utl_strlist.cpp b/TAO/TAO_IDL/util/utl_strlist.cpp index 511dd08d277..004c415fd5f 100644 --- a/TAO/TAO_IDL/util/utl_strlist.cpp +++ b/TAO/TAO_IDL/util/utl_strlist.cpp @@ -68,9 +68,9 @@ trademarks or registered trademarks of Sun Microsystems, Inc. // NOTE: This list class only works correctly because we use single public // inheritance, as opposed to multiple inheritance or public virtual. -// It relies on a type-unsafe cast from UTL_List to subclasses, which -// will cease to operate correctly if you use either multiple or -// public virtual inheritance. +// It relies on a type-unsafe cast from UTL_List to subclasses, which +// will cease to operate correctly if you use either multiple or +// public virtual inheritance. #include "utl_strlist.h" #include "utl_string.h" @@ -81,11 +81,11 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "ace/OS_Memory.h" #include "ace/OS_NS_string.h" -ACE_RCSID (util, - utl_strlist, +ACE_RCSID (util, + utl_strlist, "$Id$") -UTL_StrList::UTL_StrList (UTL_String *s, +UTL_StrList::UTL_StrList (UTL_String *s, UTL_StrList *cdr) : UTL_List(cdr), pd_car_data(s) @@ -131,14 +131,14 @@ UTL_StrList::copy (void) if (this->tail () == 0) { ACE_NEW_RETURN (retval, - UTL_StrList (head (), + UTL_StrList (head (), 0), 0); } else { ACE_NEW_RETURN (retval, - UTL_StrList (head (), + UTL_StrList (head (), (UTL_StrList *) this->tail ()->copy ()), 0); } @@ -165,10 +165,10 @@ void UTL_StrList::dump (ACE_OSTREAM_TYPE &o) { char *s = 0; - idl_bool first = I_TRUE; - idl_bool second = I_FALSE; + bool first = true; + bool second = false; - for (UTL_StrlistActiveIterator i (this); !i.is_done(); i.next ()) + for (UTL_StrlistActiveIterator i (this); !i.is_done(); i.next ()) { if (!first) { @@ -176,21 +176,21 @@ UTL_StrList::dump (ACE_OSTREAM_TYPE &o) } else if (second) { - first = second = I_FALSE; + first = second = false; } s = i.item ()->get_string (); o << s; - if (first) + if (first) { if (ACE_OS::strcmp (s, "::") != 0) { - first = I_FALSE; + first = false; } else { - second = I_TRUE; + second = true; } } } diff --git a/TAO/TAO_IDL/util/utl_tmpl/utl_idlist.cpp b/TAO/TAO_IDL/util/utl_tmpl/utl_idlist.cpp index becb6e8d3d1..3f4780aa82e 100644 --- a/TAO/TAO_IDL/util/utl_tmpl/utl_idlist.cpp +++ b/TAO/TAO_IDL/util/utl_tmpl/utl_idlist.cpp @@ -94,10 +94,10 @@ UTL_IdList::last_component (void) void UTL_IdList::dump (ACE_OSTREAM_TYPE &o) { - long first = I_TRUE; - long second = I_FALSE; + long first = true; + long second = false; - for (UTL_IdListActiveIterator (this); !i.is_done (); i.next ()) + for (UTL_IdListActiveIterator (this); !i.is_done (); i.next ()) { if (!first) { @@ -105,20 +105,20 @@ UTL_IdList::dump (ACE_OSTREAM_TYPE &o) } else if (second) { - first = second = I_FALSE; + first = second = false; } i.item ()->dump (o); - if (first) + if (first) { if (ACE_OS::strcmp (i.item ()->get_string (), "::") != 0) { - first = I_FALSE; + first = false; } else { - second = I_TRUE; + second = true; } } } diff --git a/TAO/TAO_IDL/util/utl_tmpl/utl_list.cpp b/TAO/TAO_IDL/util/utl_tmpl/utl_list.cpp index 4bdee8e19cb..15b3abb62c6 100644 --- a/TAO/TAO_IDL/util/utl_tmpl/utl_list.cpp +++ b/TAO/TAO_IDL/util/utl_tmpl/utl_list.cpp @@ -56,9 +56,9 @@ // // Implementation of generic single-linked lists -#include <stddef.h> -#include <utl_list.hh> -#include <idl_bool.hh> +#include <stddef.h> +#include <utl_list.hh> +#include <bool.hh> ACE_RCSID(utl_tmpl, utl_list, "$Id$") @@ -68,8 +68,8 @@ ACE_RCSID(utl_tmpl, utl_list, "$Id$") template<class L, class T> UTL_List<L, T>::UTL_List(T *c, L *l) - : pd_car_data(c), - pd_cdr_data(l) + : pd_car_data(c), + pd_cdr_data(l) { } @@ -168,7 +168,7 @@ UTL_List<L, T>::length() template<class L, class T> UTL_ListActiveIterator<L, T>::UTL_ListActiveIterator(UTL_List<L, T> *s) - : source(s) + : source(s) { } @@ -185,7 +185,7 @@ template<class L, class T> long UTL_ListActiveIterator<L, T>::is_done() { - return (source == NULL) ? I_TRUE : I_FALSE; + return (source == NULL) ? true : false; } // Get current item diff --git a/TAO/TAO_IDL/util/utl_tmpl/utl_strlist.cpp b/TAO/TAO_IDL/util/utl_tmpl/utl_strlist.cpp index baeeb6b0f77..3ee0b417f08 100644 --- a/TAO/TAO_IDL/util/utl_tmpl/utl_strlist.cpp +++ b/TAO/TAO_IDL/util/utl_tmpl/utl_strlist.cpp @@ -93,10 +93,10 @@ UTL_StrList::dump (ACE_OSTREAM_TYPE &o) { char *s = 0;; UTL_StrlistActiveIterator *i = new UTL_StrlistActiveIterator (this); - long first = I_TRUE; - long second = I_FALSE; + long first = true; + long second = false; - for (UTL_StrlistActiveIterator (this); !i.is_done(); i.next ()) + for (UTL_StrlistActiveIterator (this); !i.is_done(); i.next ()) { if (!first) { @@ -104,21 +104,21 @@ UTL_StrList::dump (ACE_OSTREAM_TYPE &o) } else if (second) { - first = second = I_FALSE; + first = second = false; } s = i.item ()->get_string (); o << s; - if (first) + if (first) { if (ACE_OS::strcmp (s, "::") != 0) { - first = I_FALSE; + first = false; } else { - second = I_TRUE; + second = true; } } } |