diff options
401 files changed, 2361 insertions, 4137 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 55c06663ad4..4c8b4a23445 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,530 @@ +Thu Feb 4 08:36:43 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> + + Merged revision 88756-88826 from idl3_plus_backend2 to svn head. + + Wed Feb 3 21:37:08 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu> + + * TAO_IDL/be_include/be_visitor_xplicit_pre_proc.h: + * TAO_IDL/be/be_visitor_xplicit_pre_proc.cpp: + + New visitor specialized to generate the contents of + the home explicit implied IDL interface. + + * TAO_IDL/include/ast_home.h: + * TAO_IDL/be/be_visitor_ccm_pre_proc.cpp: + * TAO_IDL/ast/ast_home.cpp: + * TAO_IDL/be_include/be_visitor_ccm_pre_proc.h: + * TAO_IDL/util/utl_scope.cpp: + + Completed changes to handle home factories and finders + as part of the home scope rather than in separate list + members of the home class. + + * orbsvcs/IFR_Service/ifr_adding_visitor.h: + * orbsvcs/IFR_Service/ifr_adding_visitor.cpp: + + Change IFR loader backend correspondingly with the + change above to home factories and finders. + + Mon Feb 1 22:30:44 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu> + + * TAO_IDL/be/be_visitor_home/factory_svs.cpp: + * TAO_IDL/be_include/be_visitor_home/factory_svs.h: + + Removed this recently-added visitor, turned out + to be unnecessary. + + * TAO_IDL/be/be_visitor_home/home_svs.cpp: + * TAO_IDL/be/be_visitor_home/home_exs.cpp: + * TAO_IDL/be/be_visitor_home/home_svh.cpp: + * TAO_IDL/be/be_visitor_home/home_ex_idl.cpp: + * TAO_IDL/be/be_visitor_home/home_exh.cpp: + * TAO_IDL/be/be_visitor_operation/arglist.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_init_arglist_ch.cpp: + * TAO_IDL/be/be_visitor_valuetype/arglist.cpp: + * TAO_IDL/be/be_decl.cpp: + * TAO_IDL/be/be_visitor_home.cpp: + * TAO_IDL/be/be_visitor_operation.cpp: + * TAO_IDL/be/be_scope.cpp: + * TAO_IDL/be/be_visitor_ccm_pre_proc.cpp: + * TAO_IDL/ast/ast_visitor_tmpl_module_inst.cpp: + * TAO_IDL/be_include/be_visitor_home/home_ex_idl.h: + * TAO_IDL/be_include/be_visitor_home/home_exh.h: + * TAO_IDL/be_include/be_visitor_home/home_svs.h: + * TAO_IDL/be_include/be_visitor_home/home_exs.h: + * TAO_IDL/be_include/be_visitor_home/home_svh.h: + * TAO_IDL/be_include/be_visitor_operation/arglist.h: + * TAO_IDL/be_include/be_visitor_ccm_pre_proc.h: + * TAO_IDL/be_include/be_visitor_home.h: + + More work toward handling home factories and + finders as members of the home's scope rather + than as a list in the home class. In progress. + + Fri Jan 29 22:03:03 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu> + + * TAO_IDL/be/be_visitor_home/factory_svs.cpp: + * TAO_IDL/be_include/be_visitor_home/factory_svs.h: + + New visitor for homes, encapsulating the issues of + factory and finder code generation in the servant + source file. + + * TAO_IDL/include/ast_valuetype.h: + * TAO_IDL/include/ast_home.h: + * TAO_IDL/include/ast_visitor_tmpl_module_inst.h: + * TAO_IDL/include/utl_scope.h: + * TAO_IDL/be/be_visitor_home/home_svs.cpp: + * TAO_IDL/be/be_visitor_home/home_svh.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_init_arglist_ch.cpp: + * TAO_IDL/be/be_visitor_home.cpp: + * TAO_IDL/be/be_finder.cpp: + * TAO_IDL/ast/ast_home.cpp: + * TAO_IDL/ast/ast_visitor_tmpl_module_inst.cpp: + * TAO_IDL/ast/ast_finder.cpp: + * TAO_IDL/ast/ast_redef.cpp: + * TAO_IDL/be_include/be_visitor_home/home_svs.h: + * TAO_IDL/be_include/be_visitor_home/home_svh.h: + * TAO_IDL/be_include/be_visitor_home.h: + * TAO_IDL/fe/y.tab.cpp: + * TAO_IDL/fe/idl.yy: + * TAO_IDL/util/utl_scope.cpp: + + In-progress change of home factory and finder handling. + Instead of being stored in lists in the home node, they + will be members of the home scope like any other legal + construct for a home scope. + + Fri Jan 29 18:08:41 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu> + + * TAO_IDL/include/ast_finder.h: + * TAO_IDL/be/be_finder.cpp: + * TAO_IDL/ast/ast_finder.cpp: + * TAO_IDL/be_include/be_finder.h: + + New AST node classes, representing an IDL home + finder construct. + + * orbsvcs/IFR_Service/ifr_visitor.h: + * orbsvcs/IFR_Service/ifr_visitor.cpp: + * orbsvcs/IFR_Service/ifr_adding_visitor.cpp: + + Updated backend with no-op overrides of + visit_* methods added to the front end. + + * TAO_IDL/include/ast_generator.h: + * TAO_IDL/include/ast_visitor_reifying.h: + * TAO_IDL/include/ast_decl.h: + * TAO_IDL/include/ast_factory.h: + * TAO_IDL/include/ast_visitor_tmpl_module_inst.h: + * TAO_IDL/include/ast_visitor.h: + * TAO_IDL/be/be_factory.cpp: + * TAO_IDL/be/be_visitor.cpp: + * TAO_IDL/be/be_generator.cpp: + * TAO_IDL/ast/ast_visitor_tmpl_module_inst.cpp: + * TAO_IDL/ast/ast_generator.cpp: + * TAO_IDL/ast/ast_visitor_reifying.cpp: + * TAO_IDL/ast/ast_factory.cpp: + * TAO_IDL/be_include/be_visitor.h: + * TAO_IDL/be_include/be_factory.h: + * TAO_IDL/be_include/be_generator.h: + * TAO_IDL/fe/y.tab.cpp: + * TAO_IDL/fe/idl.yy: + * TAO_IDL/narrow/narrow.cpp: + + Other changes corresponding to the addition + of the new AST classes and visit_* methods + above. + + Thu Jan 28 20:04:42 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu> + + * TAO_IDL/include/ast_decl.h: + * TAO_IDL/include/utl_scope.h: + * TAO_IDL/be/be_visitor_operation/arglist.cpp: + * TAO_IDL/be/be_visitor_operation/argument.cpp: + * TAO_IDL/be/be_sequence.cpp: + * TAO_IDL/ast/ast_interface.cpp: + * TAO_IDL/ast/ast_module.cpp: + * TAO_IDL/ast/ast_interface_fwd.cpp: + * TAO_IDL/ast/ast_decl.cpp: + * TAO_IDL/fe/y.tab.cpp: + * TAO_IDL/fe/fe_extern.cpp: + * TAO_IDL/fe/idl.yy: + * TAO_IDL/util/utl_scope.cpp: + + Removal of more unnecessary code. + + Thu Jan 28 18:13:19 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu> + + * TAO_IDL/be/be_union.cpp: + * TAO_IDL/be/be_visitor_exception/exception.cpp: + * TAO_IDL/be/be_visitor_exception/any_op_ch.cpp: + * TAO_IDL/be/be_visitor_exception/cdr_op_ch.cpp: + * TAO_IDL/be/be_visitor_exception/exception_cs.cpp: + * TAO_IDL/be/be_visitor_exception/exception_ctor.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/any_op_cs.cpp: + * TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp: + * TAO_IDL/be/be_visitor_exception/ctor_assign.cpp: + * TAO_IDL/be/be_visitor_typedef/any_op_ch.cpp: + * TAO_IDL/be/be_visitor_typedef/cdr_op_ch.cpp: + * TAO_IDL/be/be_visitor_typedef/typedef.cpp: + * TAO_IDL/be/be_visitor_typedef/serializer_op_ch.cpp: + * TAO_IDL/be/be_visitor_typedef/typedef_cs.cpp: + * TAO_IDL/be/be_visitor_typedef/any_op_cs.cpp: + * TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp: + * TAO_IDL/be/be_visitor_typedef/cdr_op_cs.cpp: + * TAO_IDL/be/be_visitor_typedef/typedef_ci.cpp: + * TAO_IDL/be/be_visitor_typedef/serializer_op_cs.cpp: + * TAO_IDL/be/be_interface_fwd.cpp: + * TAO_IDL/be/be_attribute.cpp: + * TAO_IDL/be/be_visitor_native.cpp: + * TAO_IDL/be/be_visitor_typecode/typecode_decl.cpp: + * TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp: + * TAO_IDL/be/be_visitor_arg_traits.cpp: + * TAO_IDL/be/be_valuetype.cpp: + * TAO_IDL/be/be_visitor_argument/invoke_cs.cpp: + * TAO_IDL/be/be_visitor_argument/argument.cpp: + * TAO_IDL/be/be_visitor_argument/arglist.cpp: + * TAO_IDL/be/be_visitor_argument/upcall_ss.cpp: + * TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp: + * TAO_IDL/be/be_visitor_argument/post_upcall_ss.cpp: + * TAO_IDL/be/be_visitor_argument/marshal_ss.cpp: + * TAO_IDL/be/be_visitor_argument/paramlist.cpp: + * TAO_IDL/be/be_visitor_home/home_ch.cpp: + * TAO_IDL/be/be_visitor_home/home_exs.cpp: + * TAO_IDL/be/be_visitor_home/home_ex_idl.cpp: + * TAO_IDL/be/be_visitor_home/home_exh.cpp: + * TAO_IDL/be/be_visitor_home/home_cs.cpp: + * TAO_IDL/be/be_union_fwd.cpp: + * TAO_IDL/be/be_visitor_interface/proxy_impls_ch.cpp: + * TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp: + * TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp: + * TAO_IDL/be/be_visitor_interface/amh_rh_ss.cpp: + * TAO_IDL/be/be_visitor_interface/base_proxy_impl_ch.cpp: + * TAO_IDL/be/be_visitor_interface/remote_proxy_broker_ch.cpp: + * TAO_IDL/be/be_visitor_interface/interface_ci.cpp: + * TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp: + * TAO_IDL/be/be_visitor_interface/amh_ch.cpp: + * TAO_IDL/be/be_visitor_interface/interface_ih.cpp: + * TAO_IDL/be/be_visitor_interface/cdr_op_ch.cpp: + * TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp: + * TAO_IDL/be/be_visitor_interface/interface_cs.cpp: + * TAO_IDL/be/be_visitor_interface/remote_proxy_broker_cs.cpp: + * TAO_IDL/be/be_visitor_interface/base_proxy_broker_ch.cpp: + * TAO_IDL/be/be_visitor_interface/interface_sh.cpp: + * TAO_IDL/be/be_visitor_interface/interface_si.cpp: + * TAO_IDL/be/be_visitor_interface/interface_is.cpp: + * TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp: + * TAO_IDL/be/be_visitor_interface/amh_sh.cpp: + * TAO_IDL/be/be_visitor_interface/any_op_ch.cpp: + * TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp: + * TAO_IDL/be/be_visitor_interface/amh_si.cpp: + * TAO_IDL/be/be_visitor_interface/ami_interface_ch.cpp: + * TAO_IDL/be/be_visitor_interface/interface.cpp: + * TAO_IDL/be/be_visitor_interface/interface_ss.cpp: + * TAO_IDL/be/be_visitor_interface/amh_ss.cpp: + * TAO_IDL/be/be_visitor_interface/any_op_cs.cpp: + * TAO_IDL/be/be_visitor_interface/tie_sh.cpp: + * TAO_IDL/be/be_visitor_interface/interface_svh.cpp: + * TAO_IDL/be/be_visitor_interface/proxy_brokers_ch.cpp: + * TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp: + * TAO_IDL/be/be_visitor_interface/tie_ss.cpp: + * TAO_IDL/be/be_visitor_interface/remote_proxy_impl_ch.cpp: + * TAO_IDL/be/be_visitor_interface/amh_rh_sh.cpp: + * TAO_IDL/be/be_visitor_interface/interface_svs.cpp: + * TAO_IDL/be/be_visitor_operation/smart_proxy_ch.cpp: + * TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp: + * TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp: + * TAO_IDL/be/be_visitor_operation/remote_proxy_impl_cs.cpp: + * TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp: + * TAO_IDL/be/be_visitor_operation/arglist.cpp: + * TAO_IDL/be/be_visitor_operation/base_proxy_impl_ch.cpp: + * TAO_IDL/be/be_visitor_operation/exceptlist_cs.cpp: + * TAO_IDL/be/be_visitor_operation/smart_proxy_cs.cpp: + * TAO_IDL/be/be_visitor_operation/rettype_return_cs.cpp: + * TAO_IDL/be/be_visitor_operation/operation_ih.cpp: + * TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp: + * TAO_IDL/be/be_visitor_operation/operation_cs.cpp: + * TAO_IDL/be/be_visitor_operation/exceptlist_ss.cpp: + * TAO_IDL/be/be_visitor_operation/operation_sh.cpp: + * TAO_IDL/be/be_visitor_operation/operation_is.cpp: + * TAO_IDL/be/be_visitor_operation/rettype.cpp: + * TAO_IDL/be/be_visitor_operation/amh_sh.cpp: + * TAO_IDL/be/be_visitor_operation/operation.cpp: + * TAO_IDL/be/be_visitor_operation/operation_ss.cpp: + * TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_ch.cpp: + * TAO_IDL/be/be_visitor_operation/amh_ss.cpp: + * TAO_IDL/be/be_visitor_operation/tie_sh.cpp: + * TAO_IDL/be/be_visitor_operation/ami_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/ami_exception_holder_operation_cs.cpp: + * TAO_IDL/be/be_visitor_operation/tie_ss.cpp: + * TAO_IDL/be/be_visitor_operation/amh_rh_sh.cpp: + * TAO_IDL/be/be_visitor_operation/argument_marshal.cpp: + * TAO_IDL/be/be_visitor_operation/ami_cs.cpp: + * TAO_IDL/be/be_visitor_operation/argument_invoke.cpp: + * TAO_IDL/be/be_visitor_root.cpp: + * TAO_IDL/be/be_codegen.cpp: + * TAO_IDL/be/be_union_branch.cpp: + * TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp: + * TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp: + * TAO_IDL/be/be_visitor_sequence/serializer_op_ch.cpp: + * TAO_IDL/be/be_visitor_sequence/sequence_base.cpp: + * TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp: + * TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp: + * TAO_IDL/be/be_visitor_sequence/buffer_type.cpp: + * TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp: + * TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp: + * TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp: + * TAO_IDL/be/be_visitor_union.cpp: + * TAO_IDL/be/be_valuetype_fwd.cpp: + * TAO_IDL/be/be_visitor_ami_pre_proc.cpp: + * TAO_IDL/be/be_visitor_interface_fwd.cpp: + * TAO_IDL/be/be_visitor_root/root_ci.cpp: + * TAO_IDL/be/be_visitor_root/root_sth.cpp: + * TAO_IDL/be/be_visitor_root/root_exs.cpp: + * TAO_IDL/be/be_visitor_root/root_ih.cpp: + * TAO_IDL/be/be_visitor_root/root_svh.cpp: + * TAO_IDL/be/be_visitor_root/cdr_op.cpp: + * TAO_IDL/be/be_visitor_root/serializer_op.cpp: + * TAO_IDL/be/be_visitor_root/root_ex_idl.cpp: + * TAO_IDL/be/be_visitor_root/root_cs.cpp: + * TAO_IDL/be/be_visitor_root/root_sh.cpp: + * TAO_IDL/be/be_visitor_root/root_svs.cpp: + * TAO_IDL/be/be_visitor_root/root_is.cpp: + * TAO_IDL/be/be_visitor_root/root_si.cpp: + * TAO_IDL/be/be_visitor_root/root.cpp: + * TAO_IDL/be/be_visitor_root/any_op.cpp: + * TAO_IDL/be/be_visitor_root/root_exh.cpp: + * TAO_IDL/be/be_visitor_root/root_ss.cpp: + * TAO_IDL/be/be_visitor_root/root_ch.cpp: + * TAO_IDL/be/be_type.cpp: + * TAO_IDL/be/be_visitor_valuebox/any_op_ch.cpp: + * TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp: + * TAO_IDL/be/be_visitor_valuebox/cdr_op_ch.cpp: + * TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp: + * TAO_IDL/be/be_visitor_valuebox/valuebox.cpp: + * TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp: + * TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp: + * TAO_IDL/be/be_visitor_valuebox/cdr_op_cs.cpp: + * TAO_IDL/be/be_visitor_valuebox/field_ch.cpp: + * TAO_IDL/be/be_visitor_enum.cpp: + * TAO_IDL/be/be_home.cpp: + * TAO_IDL/be/be_visitor_template_export.cpp: + * TAO_IDL/be/be_visitor_component_fwd/any_op_ch.cpp: + * TAO_IDL/be/be_visitor_component_fwd/cdr_op_ch.cpp: + * TAO_IDL/be/be_visitor_component_fwd/component_fwd_ch.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp: + * TAO_IDL/be/be_visitor_valuetype/field_ci.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ci.cpp: + * TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_init_arglist_ch.cpp: + * TAO_IDL/be/be_visitor_valuetype/field_cdr_cs.cpp: + * TAO_IDL/be/be_visitor_valuetype/marshal_ch.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp: + * TAO_IDL/be/be_visitor_valuetype/arglist.cpp: + * TAO_IDL/be/be_visitor_valuetype/ami_exception_holder_cs.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_sh.cpp: + * TAO_IDL/be/be_visitor_valuetype/field_cs.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_si.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp: + * TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp: + * TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_init_ci.cpp: + * TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp: + * TAO_IDL/be/be_visitor_valuetype/field_cdr_ch.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp: + * TAO_IDL/be/be_visitor_valuetype/obv_module.cpp: + * TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp: + * TAO_IDL/be/be_visitor_valuetype/ami_exception_holder_ch.cpp: + * TAO_IDL/be/be_visitor_valuetype/field_ch.cpp: + * TAO_IDL/be/be_helper.cpp: + * TAO_IDL/be/be_valuebox.cpp: + * TAO_IDL/be/be_visitor_union_fwd/union_fwd_ch.cpp: + * TAO_IDL/be/be_visitor_valuetype_fwd.cpp: + * TAO_IDL/be/be_visitor_structure_fwd/structure_fwd_ch.cpp: + * TAO_IDL/be/be_component.cpp: + * TAO_IDL/be/be_visitor_exception.cpp: + * TAO_IDL/be/be_visitor_typedef.cpp: + * TAO_IDL/be/be_visitor_union_branch.cpp: + * TAO_IDL/be/be_visitor_typecode.cpp: + * TAO_IDL/be/be_visitor_argument.cpp: + * TAO_IDL/be/be_component_fwd.cpp: + * TAO_IDL/be/be_visitor_union_branch/cdr_op_ch.cpp: + * TAO_IDL/be/be_visitor_union_branch/serializer_op_ch.cpp: + * TAO_IDL/be/be_visitor_union_branch/public_cs.cpp: + * TAO_IDL/be/be_visitor_union_branch/private_ch.cpp: + * TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp: + * TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp: + * TAO_IDL/be/be_visitor_union_branch/public_ch.cpp: + * TAO_IDL/be/be_visitor_union_branch/public_constructor_cs.cpp: + * TAO_IDL/be/be_visitor_union_branch/public_ci.cpp: + * TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp: + * TAO_IDL/be/be_visitor_union_branch/serializer_op_cs.cpp: + * TAO_IDL/be/be_visitor_home.cpp: + * TAO_IDL/be/be_visitor_constant.cpp: + * TAO_IDL/be/be_visitor_amh_pre_proc.cpp: + * TAO_IDL/be/be_interface_strategy.cpp: + * TAO_IDL/be/be_operation_strategy.cpp: + * TAO_IDL/be/be_field.cpp: + * TAO_IDL/be/be_visitor_native/native_ch.cpp: + * TAO_IDL/be/be_module.cpp: + * TAO_IDL/be/be_visitor_sequence.cpp: + * TAO_IDL/be/be_visitor_constant/constant_cs.cpp: + * TAO_IDL/be/be_visitor_constant/constant_ch.cpp: + * TAO_IDL/be/be_structure_fwd.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/cdr_op_ch.cpp: + * TAO_IDL/be/be_visitor_component/component_ih.cpp: + * TAO_IDL/be/be_visitor_component/component_cs.cpp: + * TAO_IDL/be/be_visitor_component/cdr_op_cs.cpp: + * TAO_IDL/be/be_visitor_component/component_sh.cpp: + * TAO_IDL/be/be_visitor_component/component_is.cpp: + * TAO_IDL/be/be_visitor_component/component_si.cpp: + * TAO_IDL/be/be_visitor_component/any_op_ch.cpp: + * TAO_IDL/be/be_visitor_component/component.cpp: + * TAO_IDL/be/be_visitor_component/component_ss.cpp: + * TAO_IDL/be/be_visitor_component/any_op_cs.cpp: + * TAO_IDL/be/be_predefined_type.cpp: + * TAO_IDL/be/be_visitor_array/array.cpp: + * TAO_IDL/be/be_visitor_array/any_op_ch.cpp: + * TAO_IDL/be/be_visitor_array/cdr_op_ch.cpp: + * TAO_IDL/be/be_visitor_array/serializer_op_ch.cpp: + * TAO_IDL/be/be_visitor_array/array_cs.cpp: + * TAO_IDL/be/be_visitor_array/array_ci.cpp: + * TAO_IDL/be/be_visitor_array/any_op_cs.cpp: + * TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp: + * TAO_IDL/be/be_visitor_array/serializer_op_cs.cpp: + * TAO_IDL/be/be_visitor_component_fwd.cpp: + * TAO_IDL/be/be_argument.cpp: + * TAO_IDL/be/be_visitor_module/module_ch.cpp: + * TAO_IDL/be/be_visitor_module/module_sh.cpp: + * TAO_IDL/be/be_visitor_module/any_op.cpp: + * TAO_IDL/be/be_visitor_module/module.cpp: + * TAO_IDL/be/be_visitor_module/module_ih.cpp: + * TAO_IDL/be/be_visitor_module/cdr_op.cpp: + * TAO_IDL/be/be_visitor_module/serializer_op.cpp: + * TAO_IDL/be/be_visitor_decl.cpp: + * TAO_IDL/be/be_visitor_union/discriminant_ch.cpp: + * TAO_IDL/be/be_visitor_union/any_op_ch.cpp: + * TAO_IDL/be/be_visitor_union/discriminant_ci.cpp: + * TAO_IDL/be/be_visitor_union/cdr_op_ch.cpp: + * TAO_IDL/be/be_visitor_union/serializer_op_ch.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.cpp: + * TAO_IDL/be/be_visitor_union/discriminant_cs.cpp: + * TAO_IDL/be/be_visitor_union/any_op_cs.cpp: + * TAO_IDL/be/be_visitor_union/serializer_op_cs.cpp: + * TAO_IDL/be/be_visitor_union/union_cs.cpp: + * TAO_IDL/be/be_constant.cpp: + * TAO_IDL/be/be_visitor_valuetype.cpp: + * TAO_IDL/be/be_exception.cpp: + * TAO_IDL/be/be_visitor_structure/any_op_ch.cpp: + * TAO_IDL/be/be_visitor_structure/cdr_op_ch.cpp: + * TAO_IDL/be/be_visitor_structure/structure.cpp: + * TAO_IDL/be/be_visitor_structure/serializer_op_ch.cpp: + * TAO_IDL/be/be_visitor_structure/structure_cs.cpp: + * TAO_IDL/be/be_visitor_structure/any_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/serializer_op_cs.cpp: + * TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp: + * TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ch.cpp: + * TAO_IDL/be/be_visitor_interface_fwd/interface_fwd_ch.cpp: + * TAO_IDL/be/be_global.cpp: + * TAO_IDL/be/be_null_return_emitter.cpp: + * TAO_IDL/be/be_visitor_enum/enum_ch.cpp: + * TAO_IDL/be/be_visitor_enum/any_op_ch.cpp: + * TAO_IDL/be/be_visitor_enum/cdr_op_ch.cpp: + * TAO_IDL/be/be_visitor_enum/serializer_op_ch.cpp: + * TAO_IDL/be/be_visitor_enum/enum_cs.cpp: + * TAO_IDL/be/be_visitor_enum/any_op_cs.cpp: + * TAO_IDL/be/be_visitor_enum/cdr_op_cs.cpp: + * TAO_IDL/be/be_visitor_enum/serializer_op_cs.cpp: + * TAO_IDL/be/be_visitor_context.cpp: + * TAO_IDL/be/be_visitor_union_fwd.cpp: + * TAO_IDL/be/be_visitor_structure_fwd.cpp: + * TAO_IDL/be/be_visitor_field/field_ci.cpp: + * TAO_IDL/be/be_visitor_field/cdr_op_ch.cpp: + * TAO_IDL/be/be_visitor_field/serializer_op_ch.cpp: + * TAO_IDL/be/be_visitor_field/field_cs.cpp: + * TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp: + * TAO_IDL/be/be_visitor_field/serializer_op_cs.cpp: + * TAO_IDL/be/be_visitor_field/field_ch.cpp: + * TAO_IDL/be/be_root.cpp: + * TAO_IDL/be/be_interface.cpp: + * TAO_IDL/be/be_enum.cpp: + * TAO_IDL/be/be_string.cpp: + * TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.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/be_array.cpp: + * TAO_IDL/be/be_visitor_traits.cpp: + * TAO_IDL/be/be_visitor_factory.cpp: + * TAO_IDL/be/be_native.cpp: + * TAO_IDL/be/be_generator.cpp: + * TAO_IDL/ast/ast_union_fwd.cpp: + * TAO_IDL/ast/ast_structure_fwd.cpp: + * TAO_IDL/ast/ast_concrete_type.cpp: + * TAO_IDL/ast/ast_predefined_type.cpp: + * TAO_IDL/ast/ast_enum_val.cpp: + * TAO_IDL/ast/ast_recursive.cpp: + * TAO_IDL/ast/ast_valuetype_fwd.cpp: + * TAO_IDL/ast/ast_root.cpp: + * TAO_IDL/ast/ast_eventtype_fwd.cpp: + * TAO_IDL/ast/ast_valuebox.cpp: + * TAO_IDL/ast/ast_redef.cpp: + * TAO_IDL/ast/ast_union_label.cpp: + * TAO_IDL/ast/ast_interface_fwd.cpp: + * TAO_IDL/ast/ast_component_fwd.cpp: + * TAO_IDL/ast/ast_enum.cpp: + * TAO_IDL/ast/ast_string.cpp: + * TAO_IDL/ast/ast_check.cpp: + * TAO_IDL/ast/ast_type.cpp: + * TAO_IDL/ast/ast_native.cpp: + * TAO_IDL/be_include/be_visitor_context.h: + * TAO_IDL/fe/fe_global.cpp: + * TAO_IDL/fe/fe_init.cpp: + * TAO_IDL/fe/fe_extern.cpp: + * TAO_IDL/fe/fe_private.cpp: + * TAO_IDL/driver/drv_mcpp_preproc.cpp: + * TAO_IDL/driver/drv_preproc.cpp: + * TAO_IDL/narrow/narrow.cpp: + * TAO_IDL/util/utl_identifier.cpp: + * TAO_IDL/util/utl_tmpl/utl_exprlist.cpp: + * TAO_IDL/util/utl_tmpl/utl_list.cpp: + * TAO_IDL/util/utl_tmpl/utl_namelist.cpp: + * TAO_IDL/util/utl_tmpl/utl_decllist.cpp: + * TAO_IDL/util/utl_tmpl/utl_exceptlist.cpp: + * TAO_IDL/util/utl_tmpl/utl_strlist.cpp: + * TAO_IDL/util/utl_tmpl/utl_idlist.cpp: + * TAO_IDL/util/utl_decllist.cpp: + * TAO_IDL/util/utl_strlist.cpp: + * TAO_IDL/util/utl_stack.cpp: + * TAO_IDL/util/utl_string.cpp: + + Removed many unused methods from class be_visitor_context, + and bits of unused code from many other files. + + Thu Jan 28 15:56:11 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu> + + * TAO_IDL/be/be_visitor_home/home_svs.cpp: + * TAO_IDL/be/be_visitor_home/home_svh.cpp: + + Added code generation for method overrides that appear as pure + virtual in the skeleton base class when the home has + a primary key. These methods throw CORBA::NO_IMPLEMENT, + since primary keys are not supported in CIAO. + Wed Feb 3 15:23:16 UTC 2010 Abdul Sowayan <sowayan@gmail.com> * orbsvcs/tests/AVStreams/Full_Profile/run_test.pl: diff --git a/TAO/TAO_IDL/ast/ast_check.cpp b/TAO/TAO_IDL/ast/ast_check.cpp index 7bb53bae46e..a56b4c70181 100644 --- a/TAO/TAO_IDL/ast/ast_check.cpp +++ b/TAO/TAO_IDL/ast/ast_check.cpp @@ -70,10 +70,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "global_extern.h" #include "utl_err.h" -ACE_RCSID (ast, - ast_check, - "$Id$") - // Static storage for remembering nodes. static AST_Type **ast_fwds = 0; static long ast_n_fwds_used = 0; diff --git a/TAO/TAO_IDL/ast/ast_component_fwd.cpp b/TAO/TAO_IDL/ast/ast_component_fwd.cpp index 2d9ffcabbf9..60f5c773998 100644 --- a/TAO/TAO_IDL/ast/ast_component_fwd.cpp +++ b/TAO/TAO_IDL/ast/ast_component_fwd.cpp @@ -4,10 +4,6 @@ #include "ast_visitor.h" #include "utl_identifier.h" -ACE_RCSID( ast, - ast_component_fwd, - "$Id$") - AST_ComponentFwd::AST_ComponentFwd (void) : COMMON_Base (), AST_Decl (), diff --git a/TAO/TAO_IDL/ast/ast_concrete_type.cpp b/TAO/TAO_IDL/ast/ast_concrete_type.cpp index 804f33933da..1bb26e6fe96 100644 --- a/TAO/TAO_IDL/ast/ast_concrete_type.cpp +++ b/TAO/TAO_IDL/ast/ast_concrete_type.cpp @@ -69,10 +69,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "ast_concrete_type.h" -ACE_RCSID (ast, - ast_concrete_type, - "$Id$") - // Constructor(s) and destructor. AST_ConcreteType::AST_ConcreteType (void) : COMMON_Base (), diff --git a/TAO/TAO_IDL/ast/ast_decl.cpp b/TAO/TAO_IDL/ast/ast_decl.cpp index 6c7b8682681..9207840d6a1 100644 --- a/TAO/TAO_IDL/ast/ast_decl.cpp +++ b/TAO/TAO_IDL/ast/ast_decl.cpp @@ -144,7 +144,6 @@ AST_Decl::AST_Decl (void) pd_line (-1), pd_local_name (0), pd_original_local_name (0), - pd_added (false), full_name_ (0), prefix_ (0), version_ (0), @@ -172,7 +171,6 @@ 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 (false), full_name_ (0), prefix_ (0), version_ (0), @@ -1197,18 +1195,6 @@ AST_Decl::set_in_main_file (bool is_it) this->pd_in_main_file = is_it; } -bool -AST_Decl::added (void) -{ - return this->pd_added; -} - -void -AST_Decl::set_added (bool is_it) -{ - this->pd_added = is_it; -} - UTL_Scope * AST_Decl::defined_in (void) { diff --git a/TAO/TAO_IDL/ast/ast_enum.cpp b/TAO/TAO_IDL/ast/ast_enum.cpp index 679f2278f78..a26070c3392 100644 --- a/TAO/TAO_IDL/ast/ast_enum.cpp +++ b/TAO/TAO_IDL/ast/ast_enum.cpp @@ -72,10 +72,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "utl_err.h" #include "utl_indenter.h" -ACE_RCSID (ast, - ast_enum, - "$Id$") - AST_Enum::AST_Enum (void) : COMMON_Base (), AST_Decl (), diff --git a/TAO/TAO_IDL/ast/ast_enum_val.cpp b/TAO/TAO_IDL/ast/ast_enum_val.cpp index 3fd3c7f2167..a43b918f9df 100644 --- a/TAO/TAO_IDL/ast/ast_enum_val.cpp +++ b/TAO/TAO_IDL/ast/ast_enum_val.cpp @@ -71,10 +71,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "ast_enum_val.h" #include "ast_visitor.h" -ACE_RCSID (ast, - ast_enum_val, - "$Id$") - AST_EnumVal::AST_EnumVal (void) : COMMON_Base (), AST_Decl (), diff --git a/TAO/TAO_IDL/ast/ast_eventtype_fwd.cpp b/TAO/TAO_IDL/ast/ast_eventtype_fwd.cpp index 0f2bd53fd17..ae987abfe2e 100644 --- a/TAO/TAO_IDL/ast/ast_eventtype_fwd.cpp +++ b/TAO/TAO_IDL/ast/ast_eventtype_fwd.cpp @@ -5,10 +5,6 @@ #include "ast_visitor.h" #include "utl_identifier.h" -ACE_RCSID( ast, - ast_eventtype_fwd, - "$Id$") - AST_EventTypeFwd::AST_EventTypeFwd (void) : COMMON_Base (), AST_Decl (), diff --git a/TAO/TAO_IDL/ast/ast_factory.cpp b/TAO/TAO_IDL/ast/ast_factory.cpp index b04773ea070..7abb347a4d4 100644 --- a/TAO/TAO_IDL/ast/ast_factory.cpp +++ b/TAO/TAO_IDL/ast/ast_factory.cpp @@ -64,7 +64,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc. */ -// AST_Factory nodes denote OBV factory construct declarations +// AST_Factory nodes denote OBV or component home factory +// construct declarations. // AST_Factory is a subclass of AST_Decl (it is not a type!) // and of UTL_Scope (the arguments are managed in a scope). @@ -90,8 +91,8 @@ AST_Factory::AST_Factory (void) } AST_Factory::AST_Factory (UTL_ScopedName *n) - : COMMON_Base (1, - 0), //@@ Always local, never abstract + : COMMON_Base (true, + false), //@@ Always local, never abstract AST_Decl (AST_Decl::NT_factory, n), UTL_Scope (AST_Decl::NT_factory), @@ -323,7 +324,7 @@ AST_Factory::fe_add_exceptions (UTL_NameList *t) return t; } -// Dump this AST_Factory node (an OBV factory construct) to the ostream o. +// Dump this AST_Factory node to the ostream o. void AST_Factory::dump (ACE_OSTREAM_TYPE &o) { @@ -335,7 +336,7 @@ AST_Factory::dump (ACE_OSTREAM_TYPE &o) // Iterator must be explicitly advanced inside the loop. for (UTL_ScopeActiveIterator i (this, IK_decls); - !i.is_done();) + !i.is_done ();) { d = i.item (); d->dump (o); @@ -348,7 +349,6 @@ AST_Factory::dump (ACE_OSTREAM_TYPE &o) } this->dump_i (o, ")"); - } int @@ -357,7 +357,6 @@ AST_Factory::ast_accept (ast_visitor *visitor) return visitor->visit_factory (this); } -// Data accessors - IMPL_NARROW_FROM_DECL(AST_Factory) IMPL_NARROW_FROM_SCOPE(AST_Factory) + diff --git a/TAO/TAO_IDL/ast/ast_finder.cpp b/TAO/TAO_IDL/ast/ast_finder.cpp new file mode 100644 index 00000000000..c85626c5c67 --- /dev/null +++ b/TAO/TAO_IDL/ast/ast_finder.cpp @@ -0,0 +1,63 @@ +// $Id$ + +#include "ast_finder.h" +#include "ast_visitor.h" + +#include "utl_identifier.h" + +AST_Finder::AST_Finder (UTL_ScopedName *n) + : COMMON_Base (true, + false), //@@ Always local, never abstract + AST_Decl (AST_Decl::NT_finder, + n), + UTL_Scope (AST_Decl::NT_finder), + AST_Factory (n) +{ +} + +AST_Finder::~AST_Finder (void) +{ +} + +void +AST_Finder::destroy (void) +{ + this->AST_Factory::destroy (); +} + +// Dump this AST_Factory node to the ostream o. +void +AST_Finder::dump (ACE_OSTREAM_TYPE &o) +{ + AST_Decl *d = 0; + + this->dump_i (o, "finder "); + this->local_name ()->dump (o); + this->dump_i (o, "("); + + // Iterator must be explicitly advanced inside the loop. + for (UTL_ScopeActiveIterator i (this, IK_decls); + !i.is_done ();) + { + d = i.item (); + d->dump (o); + i.next (); + + if (!i.is_done()) + { + this->dump_i (o, ", "); + } + } + + this->dump_i (o, ")"); +} + +int +AST_Finder::ast_accept (ast_visitor *visitor) +{ + return visitor->visit_finder (this); +} + +IMPL_NARROW_FROM_DECL(AST_Finder) +IMPL_NARROW_FROM_SCOPE(AST_Finder) + diff --git a/TAO/TAO_IDL/ast/ast_generator.cpp b/TAO/TAO_IDL/ast/ast_generator.cpp index 358f8eee92a..e61bcd69cea 100644 --- a/TAO/TAO_IDL/ast/ast_generator.cpp +++ b/TAO/TAO_IDL/ast/ast_generator.cpp @@ -104,6 +104,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "ast_typedef.h" #include "ast_native.h" #include "ast_factory.h" +#include "ast_finder.h" #include "utl_identifier.h" @@ -921,6 +922,17 @@ AST_Generator::create_factory (UTL_ScopedName *n) return retval; } +AST_Finder * +AST_Generator::create_finder (UTL_ScopedName *n) +{ + AST_Finder *retval = 0; + ACE_NEW_RETURN (retval, + AST_Finder (n), + 0); + + return retval; +} + AST_ValueBox * AST_Generator::create_valuebox (UTL_ScopedName *n, AST_Type *boxed_type) diff --git a/TAO/TAO_IDL/ast/ast_home.cpp b/TAO/TAO_IDL/ast/ast_home.cpp index 95d39563949..83e2c631ad1 100644 --- a/TAO/TAO_IDL/ast/ast_home.cpp +++ b/TAO/TAO_IDL/ast/ast_home.cpp @@ -5,6 +5,7 @@ #include "ast_valuetype.h" #include "ast_param_holder.h" #include "ast_operation.h" +#include "ast_finder.h" #include "ast_visitor.h" #include "utl_identifier.h" @@ -166,18 +167,6 @@ AST_Home::primary_key (void) const return this->pd_primary_key; } -AST_Home::INIT_LIST & -AST_Home::factories (void) -{ - return this->pd_factories; -} - -AST_Home::INIT_LIST & -AST_Home::finders (void) -{ - return this->pd_finders; -} - void AST_Home::destroy (void) { @@ -272,6 +261,114 @@ AST_Home::ast_accept (ast_visitor *visitor) return visitor->visit_home (this); } +AST_Factory * +AST_Home::fe_add_factory (AST_Factory *f) +{ + AST_Decl *d = 0; + + // Can't add to interface which was not yet defined. + if (!this->is_defined ()) + { + idl_global->err ()->error2 (UTL_Error::EIDL_DECL_NOT_DEFINED, + this, + f); + return 0; + } + + // Already defined and cannot be redefined? Or already used? + if ((d = this->lookup_for_add (f, false)) != 0) + { + if (!can_be_redefined (d)) + { + idl_global->err ()->error3 (UTL_Error::EIDL_REDEF, + f, + this, + d); + return 0; + } + + if (this->referenced (d, f->local_name ())) + { + idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE, + f, + this, + d); + return 0; + } + + if (f->has_ancestor (d)) + { + idl_global->err ()->redefinition_in_scope (f, + d); + return 0; + } + } + + // Add it to scope. + this->add_to_scope (f); + + // Add it to set of locally referenced symbols. + this->add_to_referenced (f, + false, + f->local_name ()); + + return f; +} + +AST_Finder * +AST_Home::fe_add_finder (AST_Finder *f) +{ + AST_Decl *d = 0; + + // Can't add to interface which was not yet defined. + if (!this->is_defined ()) + { + idl_global->err ()->error2 (UTL_Error::EIDL_DECL_NOT_DEFINED, + this, + f); + return 0; + } + + // Already defined and cannot be redefined? Or already used? + if ((d = this->lookup_for_add (f, false)) != 0) + { + if (!can_be_redefined (d)) + { + idl_global->err ()->error3 (UTL_Error::EIDL_REDEF, + f, + this, + d); + return 0; + } + + if (this->referenced (d, f->local_name ())) + { + idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE, + f, + this, + d); + return 0; + } + + if (f->has_ancestor (d)) + { + idl_global->err ()->redefinition_in_scope (f, + d); + return 0; + } + } + + // Add it to scope. + this->add_to_scope (f); + + // Add it to set of locally referenced symbols. + this->add_to_referenced (f, + false, + f->local_name ()); + + return f; +} + // Narrowing. IMPL_NARROW_FROM_DECL(AST_Home) diff --git a/TAO/TAO_IDL/ast/ast_interface.cpp b/TAO/TAO_IDL/ast/ast_interface.cpp index c10e3a9f53f..62a51dabed1 100644 --- a/TAO/TAO_IDL/ast/ast_interface.cpp +++ b/TAO/TAO_IDL/ast/ast_interface.cpp @@ -585,18 +585,10 @@ AST_Interface::fe_add_structure_fwd (AST_StructureFwd *t) { AST_Structure *s = AST_Structure::narrow_from_decl (d); t->set_full_definition (s); - - if (t->added () == 0) - { - t->set_added (1); - this->add_to_scope (t); - - // Must check later that all struct and union forward declarations - // are defined in the same IDL file. - AST_record_fwd_decl (t); - } - - return t; + + // Must check later that all struct and union forward declarations + // are defined in the same IDL file. + AST_record_fwd_decl (t); } else { @@ -798,17 +790,9 @@ AST_Interface::fe_add_union_fwd (AST_UnionFwd *t) AST_Union *s = AST_Union::narrow_from_decl (d); t->set_full_definition (s); - if (t->added () == 0) - { - t->set_added (1); - this->add_to_scope (t); - - // Must check later that all struct and union forward declarations - // are defined in the same IDL file. - AST_record_fwd_decl (t); - } - - return t; + // Must check later that all struct and union forward declarations + // are defined in the same IDL file. + AST_record_fwd_decl (t); } else { @@ -1123,20 +1107,6 @@ AST_Interface::fwd_redefinition_helper (AST_Interface *&i, scope = parent->defined_in (); } - // (JP) This could give a bogus error, since typeprefix can - // appear any time after the corresponding declaration. - // The right way to do this is with a separate traversal - // after the entire AST is built. - /* - if (ACE_OS::strcmp (i->prefix (), d->prefix ()) != 0) - { - idl_global->err ()->error1 (UTL_Error::EIDL_PREFIX_CONFLICT, - i); - - return; - } - */ - fd = AST_Interface::narrow_from_decl (d); // Successful? @@ -1182,7 +1152,14 @@ AST_Interface::fwd_redefinition_helper (AST_Interface *&i, } fd->redefine (i); - + + AST_InterfaceFwd *fwd = fd->fwd_decl (); + + if (fwd != 0) + { + fwd->set_as_defined (); + } + // Use full definition node. i->destroy (); delete i; diff --git a/TAO/TAO_IDL/ast/ast_interface_fwd.cpp b/TAO/TAO_IDL/ast/ast_interface_fwd.cpp index ad89b09e9c9..eccce8b48a0 100644 --- a/TAO/TAO_IDL/ast/ast_interface_fwd.cpp +++ b/TAO/TAO_IDL/ast/ast_interface_fwd.cpp @@ -75,10 +75,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "ast_visitor.h" #include "utl_identifier.h" -ACE_RCSID( ast, - ast_interface_fwd, - "$Id$") - AST_InterfaceFwd::AST_InterfaceFwd (void) : COMMON_Base (), AST_Decl (), @@ -249,7 +245,7 @@ AST_InterfaceFwd::is_defined (void) // is a sufficient way to tell if our full // definition has already gone through the // add_to_scope process. - if (0 != fwd && fwd->full_definition ()->added ()) + if (0 != fwd && fwd->is_defined ()) { this->is_defined_ = true; } diff --git a/TAO/TAO_IDL/ast/ast_module.cpp b/TAO/TAO_IDL/ast/ast_module.cpp index 2df82d58e21..c7fb1c62d73 100644 --- a/TAO/TAO_IDL/ast/ast_module.cpp +++ b/TAO/TAO_IDL/ast/ast_module.cpp @@ -868,12 +868,6 @@ AST_Module::fe_add_interface_fwd (AST_InterfaceFwd *i) return 0; } - if (i->added () == 0) - { - i->set_added (true); - this->add_to_scope (i); - } - // If the lookup found the full_definition member of another // interface_fwd, don't reset this full_definition. Otherwise // reset the member and set is_defined_ on i so it itf won't @@ -892,7 +886,7 @@ AST_Module::fe_add_interface_fwd (AST_InterfaceFwd *i) i->set_as_defined (); } - return i; +// return i; } if (!can_be_redefined (d)) { @@ -959,15 +953,9 @@ AST_Module::fe_add_valuetype_fwd (AST_ValueTypeFwd *v) return 0; } - if (v->added () == 0) - { - v->set_added (1); - this->add_to_scope (v); - } - // @@ Redefinition of forward. Type check not implemented. v->set_full_definition (vtf); // @@ Memory leak. - return v; +// return v; } if (!can_be_redefined (d)) { @@ -1040,15 +1028,9 @@ AST_Module::fe_add_eventtype_fwd (AST_EventTypeFwd *v) return 0; } - if (v->added () == 0) - { - v->set_added (1); - this->add_to_scope (v); - } - // @@ Redefinition of forward. Type check not implemented. v->set_full_definition (vtf); // @@ Memory leak. - return v; +// return v; } if (!can_be_redefined (d)) { @@ -1121,15 +1103,9 @@ AST_Module::fe_add_component_fwd (AST_ComponentFwd *c) return 0; } - if (c->added () == 0) - { - c->set_added (1); - this->add_to_scope (c); - } - // @@ Redefinition of forward. Type check not implemented. c->set_full_definition (cf); // @@ Memory leak. - return c; +// return c; } if (!can_be_redefined (d)) { @@ -1373,17 +1349,9 @@ AST_Module::fe_add_union_fwd (AST_UnionFwd *t) AST_Union *s = AST_Union::narrow_from_decl (d); t->set_full_definition (s); - if (t->added () == 0) - { - t->set_added (1); - this->add_to_scope (t); - - // Must check later that all struct and union forward declarations - // are defined in the same IDL file. - AST_record_fwd_decl (t); - } - - return t; + // Must check later that all struct and union forward declarations + // are defined in the same IDL file. + AST_record_fwd_decl (t); } else { @@ -1533,17 +1501,9 @@ AST_Module::fe_add_structure_fwd (AST_StructureFwd *t) AST_Structure *s = AST_Structure::narrow_from_decl (d); t->set_full_definition (s); - if (t->added () == 0) - { - t->set_added (1); - this->add_to_scope (t); - - // Must check later that all struct and union forward declarations - // are defined in the same IDL file. - AST_record_fwd_decl (t); - } - - return t; + // Must check later that all struct and union forward declarations + // are defined in the same IDL file. + AST_record_fwd_decl (t); } else { diff --git a/TAO/TAO_IDL/ast/ast_native.cpp b/TAO/TAO_IDL/ast/ast_native.cpp index cd672a2960c..5dbb45ad84b 100644 --- a/TAO/TAO_IDL/ast/ast_native.cpp +++ b/TAO/TAO_IDL/ast/ast_native.cpp @@ -3,10 +3,6 @@ #include "ast_native.h" #include "ast_visitor.h" -ACE_RCSID (ast, - ast_native, - "$Id$") - AST_Native::AST_Native (void) : COMMON_Base (), AST_Decl (), diff --git a/TAO/TAO_IDL/ast/ast_predefined_type.cpp b/TAO/TAO_IDL/ast/ast_predefined_type.cpp index 1fef7398594..3c329b08a70 100644 --- a/TAO/TAO_IDL/ast/ast_predefined_type.cpp +++ b/TAO/TAO_IDL/ast/ast_predefined_type.cpp @@ -78,10 +78,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "ace/Log_Msg.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (ast, - ast_predefined_type, - "$Id$") - AST_PredefinedType::AST_PredefinedType (void) : COMMON_Base (), AST_Decl (), diff --git a/TAO/TAO_IDL/ast/ast_recursive.cpp b/TAO/TAO_IDL/ast/ast_recursive.cpp index 1603b184a0b..daa002e4e74 100644 --- a/TAO/TAO_IDL/ast/ast_recursive.cpp +++ b/TAO/TAO_IDL/ast/ast_recursive.cpp @@ -84,10 +84,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "global_extern.h" #include "nr_extern.h" -ACE_RCSID (ast, - ast_recursive, - "$Id$") - bool AST_illegal_interface_recursion (AST_Decl *t) { diff --git a/TAO/TAO_IDL/ast/ast_redef.cpp b/TAO/TAO_IDL/ast/ast_redef.cpp index fd3cf9b449c..2fc3bb464c6 100644 --- a/TAO/TAO_IDL/ast/ast_redef.cpp +++ b/TAO/TAO_IDL/ast/ast_redef.cpp @@ -66,10 +66,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "ast_decl.h" -ACE_RCSID (ast, - ast_redef, - "$Id$") - // Return TRUE if the node d represents an IDL construct whose name // can be redefined. bool @@ -112,6 +108,7 @@ can_be_redefined (AST_Decl *d) case AST_Decl::NT_op: case AST_Decl::NT_pre_defined: case AST_Decl::NT_factory: + case AST_Decl::NT_finder: case AST_Decl::NT_provides: case AST_Decl::NT_uses: case AST_Decl::NT_publishes: diff --git a/TAO/TAO_IDL/ast/ast_root.cpp b/TAO/TAO_IDL/ast/ast_root.cpp index 81d6d3ab3a9..44ef45d76c9 100644 --- a/TAO/TAO_IDL/ast/ast_root.cpp +++ b/TAO/TAO_IDL/ast/ast_root.cpp @@ -78,10 +78,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "ace/OS_NS_string.h" #include "ace/OS_Memory.h" -ACE_RCSID (ast, - ast_root, - "$Id$") - AST_Root::AST_Root (void) : COMMON_Base (), AST_Decl (), diff --git a/TAO/TAO_IDL/ast/ast_string.cpp b/TAO/TAO_IDL/ast/ast_string.cpp index 3284cefeabf..f472098eb8b 100644 --- a/TAO/TAO_IDL/ast/ast_string.cpp +++ b/TAO/TAO_IDL/ast/ast_string.cpp @@ -78,10 +78,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "idl_defines.h" #include "global_extern.h" -ACE_RCSID (ast, - ast_string, - "$Id$") - AST_String::AST_String (void) : COMMON_Base (), AST_Decl (), diff --git a/TAO/TAO_IDL/ast/ast_structure_fwd.cpp b/TAO/TAO_IDL/ast/ast_structure_fwd.cpp index cd0da2b72ea..62567825d8b 100644 --- a/TAO/TAO_IDL/ast/ast_structure_fwd.cpp +++ b/TAO/TAO_IDL/ast/ast_structure_fwd.cpp @@ -10,10 +10,6 @@ #include "ast_visitor.h" #include "utl_identifier.h" -ACE_RCSID( ast, - ast_structure_fwd, - "$Id$") - AST_StructureFwd::AST_StructureFwd (void) : COMMON_Base (), AST_Decl (), diff --git a/TAO/TAO_IDL/ast/ast_type.cpp b/TAO/TAO_IDL/ast/ast_type.cpp index b4cb660d48f..137507cd9ca 100644 --- a/TAO/TAO_IDL/ast/ast_type.cpp +++ b/TAO/TAO_IDL/ast/ast_type.cpp @@ -78,10 +78,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "ace/OS_NS_stdio.h" #include "ace/OS_Memory.h" -ACE_RCSID (ast, - ast_type, - "$Id$") - AST_Type::AST_Type (void) : COMMON_Base (), AST_Decl (), diff --git a/TAO/TAO_IDL/ast/ast_union_fwd.cpp b/TAO/TAO_IDL/ast/ast_union_fwd.cpp index effe3279ce2..83f3ec8d647 100644 --- a/TAO/TAO_IDL/ast/ast_union_fwd.cpp +++ b/TAO/TAO_IDL/ast/ast_union_fwd.cpp @@ -10,10 +10,6 @@ #include "ast_visitor.h" #include "utl_identifier.h" -ACE_RCSID (ast, - ast_union_fwd, - "$Id$") - AST_UnionFwd::AST_UnionFwd (void) : COMMON_Base (), AST_Decl (), diff --git a/TAO/TAO_IDL/ast/ast_union_label.cpp b/TAO/TAO_IDL/ast/ast_union_label.cpp index 37a2e337020..47dbead41fc 100644 --- a/TAO/TAO_IDL/ast/ast_union_label.cpp +++ b/TAO/TAO_IDL/ast/ast_union_label.cpp @@ -76,10 +76,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. // FUZZ: disable check_for_streams_include #include "ace/streams.h" -ACE_RCSID (ast, - ast_union_label, - "$Id$") - AST_UnionLabel::AST_UnionLabel (void) : pd_label_kind (UL_default), pd_label_val (0) diff --git a/TAO/TAO_IDL/ast/ast_valuebox.cpp b/TAO/TAO_IDL/ast/ast_valuebox.cpp index a28b5ae29f4..86288ea95ce 100644 --- a/TAO/TAO_IDL/ast/ast_valuebox.cpp +++ b/TAO/TAO_IDL/ast/ast_valuebox.cpp @@ -4,10 +4,6 @@ #include "ast_visitor.h" #include "utl_identifier.h" -ACE_RCSID (ast, - ast_valuebox, - "ast_valuebox.cpp,v 1.0 Exp") - AST_ValueBox::AST_ValueBox (void) : COMMON_Base (), AST_Decl (), diff --git a/TAO/TAO_IDL/ast/ast_valuetype_fwd.cpp b/TAO/TAO_IDL/ast/ast_valuetype_fwd.cpp index b4e904dd808..03e89ad955e 100644 --- a/TAO/TAO_IDL/ast/ast_valuetype_fwd.cpp +++ b/TAO/TAO_IDL/ast/ast_valuetype_fwd.cpp @@ -5,10 +5,6 @@ #include "ast_visitor.h" #include "utl_identifier.h" -ACE_RCSID( ast, - ast_valuetype_fwd, - "$Id$") - AST_ValueTypeFwd::AST_ValueTypeFwd (void) : COMMON_Base (), AST_Decl (), diff --git a/TAO/TAO_IDL/ast/ast_visitor_reifying.cpp b/TAO/TAO_IDL/ast/ast_visitor_reifying.cpp index b97f0cca10b..a1fd0ababaa 100644 --- a/TAO/TAO_IDL/ast/ast_visitor_reifying.cpp +++ b/TAO/TAO_IDL/ast/ast_visitor_reifying.cpp @@ -190,6 +190,12 @@ ast_visitor_reifying::visit_factory (AST_Factory *) } int +ast_visitor_reifying::visit_finder (AST_Finder *) +{ + return 0; +} + +int ast_visitor_reifying::visit_structure (AST_Structure *node) { this->check_and_store (node); diff --git a/TAO/TAO_IDL/ast/ast_visitor_tmpl_module_inst.cpp b/TAO/TAO_IDL/ast/ast_visitor_tmpl_module_inst.cpp index f24f42f9d59..9c289e0932e 100644 --- a/TAO/TAO_IDL/ast/ast_visitor_tmpl_module_inst.cpp +++ b/TAO/TAO_IDL/ast/ast_visitor_tmpl_module_inst.cpp @@ -36,7 +36,7 @@ #include "ast_union_branch.h" #include "ast_enum.h" #include "ast_enum_val.h" -#include "ast_factory.h" +#include "ast_finder.h" #include "ast_param_holder.h" #include "ast_expression.h" @@ -58,6 +58,7 @@ ast_visitor_tmpl_module_inst::ast_visitor_tmpl_module_inst ( : ast_visitor (), ctx_ (ctx), for_eventtype_ (false), + for_finder_ (false), ref_only_ (ref_only) { } @@ -1137,8 +1138,18 @@ ast_visitor_tmpl_module_inst::visit_factory (AST_Factory *node) Identifier id (node->local_name ()->get_string ()); UTL_ScopedName sn (&id, 0); - AST_Factory *added_factory = - idl_global->gen ()->create_factory (&sn); + AST_Factory *added_factory = 0; + + if (this->for_finder_) + { + added_factory = + idl_global->gen ()->create_finder (&sn); + } + else + { + added_factory = + idl_global->gen ()->create_factory (&sn); + } idl_global->scopes ().top ()->add_to_scope (added_factory); @@ -1162,9 +1173,19 @@ ast_visitor_tmpl_module_inst::visit_factory (AST_Factory *node) added_factory->be_add_exceptions (reified_exceps); + // In case it was set for this call. + this->for_finder_ = false; + return 0; } +int +ast_visitor_tmpl_module_inst::visit_finder (AST_Finder *node) +{ + this->for_finder_ = true; + return this->visit_factory (node); +} + AST_Decl * ast_visitor_tmpl_module_inst::reify_type (AST_Decl *d) { diff --git a/TAO/TAO_IDL/be/be_argument.cpp b/TAO/TAO_IDL/be/be_argument.cpp index aa587dde2b5..6f20caa04fa 100644 --- a/TAO/TAO_IDL/be/be_argument.cpp +++ b/TAO/TAO_IDL/be/be_argument.cpp @@ -25,10 +25,6 @@ #include "nr_extern.h" #include "global_extern.h" -ACE_RCSID (be, - be_argument, - "$Id$") - be_argument::be_argument (void) : COMMON_Base (), AST_Decl (), diff --git a/TAO/TAO_IDL/be/be_array.cpp b/TAO/TAO_IDL/be/be_array.cpp index 7e66e1d4538..fc263beb48a 100644 --- a/TAO/TAO_IDL/be/be_array.cpp +++ b/TAO/TAO_IDL/be/be_array.cpp @@ -30,10 +30,6 @@ #include "ace/Log_Msg.h" -ACE_RCSID (be, - be_array, - "$Id$") - be_array::be_array (void) : COMMON_Base (), AST_Decl (), diff --git a/TAO/TAO_IDL/be/be_attribute.cpp b/TAO/TAO_IDL/be/be_attribute.cpp index 4a72062bd43..577b6e3dff0 100644 --- a/TAO/TAO_IDL/be/be_attribute.cpp +++ b/TAO/TAO_IDL/be/be_attribute.cpp @@ -25,10 +25,6 @@ #include "global_extern.h" -ACE_RCSID (be, - be_attribute, - "$Id$") - be_attribute::be_attribute (void) : COMMON_Base (), AST_Decl (), diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp index f249cd7ba24..fcb112ab684 100644 --- a/TAO/TAO_IDL/be/be_codegen.cpp +++ b/TAO/TAO_IDL/be/be_codegen.cpp @@ -25,10 +25,6 @@ #include "idl_defines.h" #include "ace/OS_NS_ctype.h" -ACE_RCSID (be, - be_codegen, - "$Id$") - TAO_CodeGen * tao_cg = 0; TAO_CodeGen::TAO_CodeGen (void) diff --git a/TAO/TAO_IDL/be/be_component.cpp b/TAO/TAO_IDL/be/be_component.cpp index ac4afefeb03..64cf353db3f 100644 --- a/TAO/TAO_IDL/be/be_component.cpp +++ b/TAO/TAO_IDL/be/be_component.cpp @@ -23,10 +23,6 @@ #include "global_extern.h" #include "utl_err.h" -ACE_RCSID (be, - be_component, - "$Id$") - be_component::be_component (void) : COMMON_Base (), AST_Decl (), diff --git a/TAO/TAO_IDL/be/be_component_fwd.cpp b/TAO/TAO_IDL/be/be_component_fwd.cpp index 1121b2dc2c6..113e327c428 100644 --- a/TAO/TAO_IDL/be/be_component_fwd.cpp +++ b/TAO/TAO_IDL/be/be_component_fwd.cpp @@ -22,10 +22,6 @@ #include "global_extern.h" #include "utl_err.h" -ACE_RCSID (be, - be_component_fwd, - "$Id$") - be_component_fwd::be_component_fwd (void) : COMMON_Base (), AST_Decl (), diff --git a/TAO/TAO_IDL/be/be_constant.cpp b/TAO/TAO_IDL/be/be_constant.cpp index 8d52e52f4d7..c6b268f5fe9 100644 --- a/TAO/TAO_IDL/be/be_constant.cpp +++ b/TAO/TAO_IDL/be/be_constant.cpp @@ -24,10 +24,6 @@ #include "utl_scope.h" #include "nr_extern.h" -ACE_RCSID (be, - be_constant, - "$Id$") - be_constant::be_constant (void) : COMMON_Base (), AST_Decl (), diff --git a/TAO/TAO_IDL/be/be_decl.cpp b/TAO/TAO_IDL/be/be_decl.cpp index df0ce31d2c7..fc12d25d443 100644 --- a/TAO/TAO_IDL/be/be_decl.cpp +++ b/TAO/TAO_IDL/be/be_decl.cpp @@ -35,6 +35,7 @@ #include "be_enum.h" #include "be_operation.h" #include "be_factory.h" +#include "be_finder.h" #include "be_sequence.h" #include "be_visitor.h" @@ -316,47 +317,49 @@ be_decl::scope (void) { be_decl *d = this; - switch (this->node_type ()) - { - case AST_Decl::NT_interface_fwd: - // Resolve forward declared interface by looking at full_definition() - // field and iterating. - d = - be_interface::narrow_from_decl ( - (be_interface_fwd::narrow_from_decl (this))->full_definition () - ); - // Fall through - case AST_Decl::NT_interface: - return be_interface::narrow_from_decl (d); - case AST_Decl::NT_module: - return be_module::narrow_from_decl (d); - case AST_Decl::NT_root: - return be_root::narrow_from_decl (d); - case AST_Decl::NT_except: - return be_exception::narrow_from_decl (d); - case AST_Decl::NT_union: - return be_union::narrow_from_decl (d); - case AST_Decl::NT_struct: - return be_structure::narrow_from_decl (d); - case AST_Decl::NT_enum: - return be_enum::narrow_from_decl (d); - case AST_Decl::NT_op: - return be_operation::narrow_from_decl (d); - case AST_Decl::NT_factory: - return be_factory::narrow_from_decl (d); - case AST_Decl::NT_sequence: - return be_sequence::narrow_from_decl (d); - case AST_Decl::NT_valuetype: - return be_valuetype::narrow_from_decl (d); - case AST_Decl::NT_component: - return be_component::narrow_from_decl (d); - case AST_Decl::NT_eventtype: - return be_eventtype::narrow_from_decl (d); - case AST_Decl::NT_home: - return be_home::narrow_from_decl (d); - default: - return (be_scope *)0; - } + switch (this->node_type ()) + { + case AST_Decl::NT_interface_fwd: + // Resolve forward declared interface by looking at full_definition() + // field and iterating. + d = + be_interface::narrow_from_decl ( + (be_interface_fwd::narrow_from_decl (this))->full_definition () + ); + // Fall through + case AST_Decl::NT_interface: + return be_interface::narrow_from_decl (d); + case AST_Decl::NT_module: + return be_module::narrow_from_decl (d); + case AST_Decl::NT_root: + return be_root::narrow_from_decl (d); + case AST_Decl::NT_except: + return be_exception::narrow_from_decl (d); + case AST_Decl::NT_union: + return be_union::narrow_from_decl (d); + case AST_Decl::NT_struct: + return be_structure::narrow_from_decl (d); + case AST_Decl::NT_enum: + return be_enum::narrow_from_decl (d); + case AST_Decl::NT_op: + return be_operation::narrow_from_decl (d); + case AST_Decl::NT_factory: + return be_factory::narrow_from_decl (d); + case AST_Decl::NT_finder: + return be_finder::narrow_from_decl (d); + case AST_Decl::NT_sequence: + return be_sequence::narrow_from_decl (d); + case AST_Decl::NT_valuetype: + return be_valuetype::narrow_from_decl (d); + case AST_Decl::NT_component: + return be_component::narrow_from_decl (d); + case AST_Decl::NT_eventtype: + return be_eventtype::narrow_from_decl (d); + case AST_Decl::NT_home: + return be_home::narrow_from_decl (d); + default: + return (be_scope *)0; + } } // Boolean methods to test if code was already generated. diff --git a/TAO/TAO_IDL/be/be_enum.cpp b/TAO/TAO_IDL/be/be_enum.cpp index b094f811f40..bf7f983d0d0 100644 --- a/TAO/TAO_IDL/be/be_enum.cpp +++ b/TAO/TAO_IDL/be/be_enum.cpp @@ -25,10 +25,6 @@ #include "global_extern.h" -ACE_RCSID (be, - be_enum, - "$Id$") - be_enum::be_enum (void) : COMMON_Base (), AST_Decl (), diff --git a/TAO/TAO_IDL/be/be_exception.cpp b/TAO/TAO_IDL/be/be_exception.cpp index f1eddd37a52..c0b39ba588f 100644 --- a/TAO/TAO_IDL/be/be_exception.cpp +++ b/TAO/TAO_IDL/be/be_exception.cpp @@ -25,10 +25,6 @@ #include "global_extern.h" -ACE_RCSID (be, - be_exception, - "$Id$") - be_exception::be_exception (void) : COMMON_Base (), AST_Decl (), diff --git a/TAO/TAO_IDL/be/be_factory.cpp b/TAO/TAO_IDL/be/be_factory.cpp index 13653d72dba..63ddb993807 100644 --- a/TAO/TAO_IDL/be/be_factory.cpp +++ b/TAO/TAO_IDL/be/be_factory.cpp @@ -3,7 +3,7 @@ // ============================================================================ // // = LIBRARY -// TAO IDL +// TAO_IDL_BE // // = FILENAME // be_factory.cpp diff --git a/TAO/TAO_IDL/be/be_field.cpp b/TAO/TAO_IDL/be/be_field.cpp index d19f6c3894b..ce6c64ec5b1 100644 --- a/TAO/TAO_IDL/be/be_field.cpp +++ b/TAO/TAO_IDL/be/be_field.cpp @@ -25,10 +25,6 @@ #include "global_extern.h" #include "ace/Log_Msg.h" -ACE_RCSID (be, - be_field, - "$Id$") - be_field::be_field (void) : COMMON_Base (), AST_Decl (), diff --git a/TAO/TAO_IDL/be/be_finder.cpp b/TAO/TAO_IDL/be/be_finder.cpp new file mode 100644 index 00000000000..76be9d9f37a --- /dev/null +++ b/TAO/TAO_IDL/be/be_finder.cpp @@ -0,0 +1,57 @@ +// $Id$ + +// ============================================================================ +// +// = LIBRARY +// TAO_IDL_BE +// +// = FILENAME +// be_finder.cpp +// +// = DESCRIPTION +// Extension of class AST_Finder that provides additional means for C++ +// mapping. +// +// = AUTHOR +// Jeff Parsons +// +// ============================================================================ + +#include "be_finder.h" +#include "be_visitor.h" + +be_finder::be_finder (UTL_ScopedName *n) + : COMMON_Base (1, + 0), //@@ Always local, never abstract + AST_Decl (AST_Decl::NT_finder, + n), + UTL_Scope (AST_Decl::NT_finder), + AST_Factory (n), + AST_Finder (n), + be_scope (AST_Decl::NT_finder), + be_decl (AST_Decl::NT_finder, + n), + be_factory (n) +{ +} + +be_finder::~be_finder (void) +{ +} + +void +be_finder::destroy (void) +{ + // Call the destroy methods of our base classes. + this->be_factory::destroy (); + this->AST_Finder::destroy (); +} + +int +be_finder::accept (be_visitor *visitor) +{ + return visitor->visit_finder (this); +} + +IMPL_NARROW_FROM_DECL (be_finder) +IMPL_NARROW_FROM_SCOPE (be_finder) diff --git a/TAO/TAO_IDL/be/be_generator.cpp b/TAO/TAO_IDL/be/be_generator.cpp index 9d6fb99f38d..774a6926e69 100644 --- a/TAO/TAO_IDL/be/be_generator.cpp +++ b/TAO/TAO_IDL/be/be_generator.cpp @@ -114,14 +114,11 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "be_typedef.h" #include "be_native.h" #include "be_factory.h" +#include "be_finder.h" #include "utl_identifier.h" #include "nr_extern.h" #include "ace/config-all.h" -ACE_RCSID (be, - be_generator, - "$Id$") - AST_Root * be_generator::create_root (UTL_ScopedName *n) { @@ -930,6 +927,17 @@ be_generator::create_factory (UTL_ScopedName *n) return retval; } +AST_Finder * +be_generator::create_finder (UTL_ScopedName *n) +{ + be_finder *retval = 0; + ACE_NEW_RETURN (retval, + be_finder (n), + 0); + + return retval; +} + AST_PortType * be_generator::create_porttype (UTL_ScopedName *n) { diff --git a/TAO/TAO_IDL/be/be_global.cpp b/TAO/TAO_IDL/be/be_global.cpp index 3db5efc7e7f..15eba0b2c63 100644 --- a/TAO/TAO_IDL/be/be_global.cpp +++ b/TAO/TAO_IDL/be/be_global.cpp @@ -33,10 +33,6 @@ #include "ace/OS_NS_sys_stat.h" #include "ace/OS_NS_ctype.h" -ACE_RCSID (be, - be_global, - "$Id$") - TAO_IDL_BE_Export BE_GlobalData *be_global = 0; BE_GlobalData::BE_GlobalData (void) diff --git a/TAO/TAO_IDL/be/be_helper.cpp b/TAO/TAO_IDL/be/be_helper.cpp index d56d7aeb689..74a9baabc07 100644 --- a/TAO/TAO_IDL/be/be_helper.cpp +++ b/TAO/TAO_IDL/be/be_helper.cpp @@ -31,10 +31,6 @@ #include "ace/OS_NS_ctype.h" #include "../../tao/Version.h" -ACE_RCSID (be, - be_helper, - "$Id$") - static const char copyright[] = "// -*- C++ -*-\n" "// $I" "d$\n\n" diff --git a/TAO/TAO_IDL/be/be_home.cpp b/TAO/TAO_IDL/be/be_home.cpp index beb83897077..842161d0ddd 100644 --- a/TAO/TAO_IDL/be/be_home.cpp +++ b/TAO/TAO_IDL/be/be_home.cpp @@ -24,10 +24,6 @@ #include "global_extern.h" #include "utl_err.h" -ACE_RCSID (be, - be_home, - "$Id$") - be_home::be_home (void) : COMMON_Base (), AST_Decl (), diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp index 097130d2efb..682f61f6bf5 100644 --- a/TAO/TAO_IDL/be/be_interface.cpp +++ b/TAO/TAO_IDL/be/be_interface.cpp @@ -46,10 +46,6 @@ #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_fcntl.h" -ACE_RCSID (be, - be_interface, - "$Id$") - // Default constructor. be_interface::be_interface (void) : COMMON_Base (), diff --git a/TAO/TAO_IDL/be/be_interface_fwd.cpp b/TAO/TAO_IDL/be/be_interface_fwd.cpp index 0f45d384287..cfe17d510c4 100644 --- a/TAO/TAO_IDL/be/be_interface_fwd.cpp +++ b/TAO/TAO_IDL/be/be_interface_fwd.cpp @@ -24,10 +24,6 @@ #include "be_visitor.h" #include "ast_interface.h" -ACE_RCSID (be, - be_interface_fwd, - "$Id$") - be_interface_fwd::be_interface_fwd (void) : COMMON_Base (), AST_Decl (), diff --git a/TAO/TAO_IDL/be/be_interface_strategy.cpp b/TAO/TAO_IDL/be/be_interface_strategy.cpp index 4d79368c580..9aaa51ec9e4 100644 --- a/TAO/TAO_IDL/be/be_interface_strategy.cpp +++ b/TAO/TAO_IDL/be/be_interface_strategy.cpp @@ -22,11 +22,6 @@ #include "be_extern.h" #include "utl_identifier.h" -ACE_RCSID (be, - be_interface_strategy, - "$Id$") - - be_interface_strategy::be_interface_strategy (be_interface *node, Strategy_Kind strategy_type) : local_name_(0), diff --git a/TAO/TAO_IDL/be/be_module.cpp b/TAO/TAO_IDL/be/be_module.cpp index 88d73078ad8..f88cf6806de 100644 --- a/TAO/TAO_IDL/be/be_module.cpp +++ b/TAO/TAO_IDL/be/be_module.cpp @@ -22,10 +22,6 @@ #include "be_module.h" #include "be_visitor.h" -ACE_RCSID (be, - be_module, - "$Id$") - be_module::be_module (void) : COMMON_Base (), AST_Decl (), diff --git a/TAO/TAO_IDL/be/be_native.cpp b/TAO/TAO_IDL/be/be_native.cpp index 3c439fe2097..8b100785ebf 100644 --- a/TAO/TAO_IDL/be/be_native.cpp +++ b/TAO/TAO_IDL/be/be_native.cpp @@ -19,11 +19,6 @@ #include "be_native.h" #include "be_visitor.h" -ACE_RCSID (be, - be_native, - "$Id$") - - be_native::be_native (void) : COMMON_Base (), AST_Decl (), diff --git a/TAO/TAO_IDL/be/be_null_return_emitter.cpp b/TAO/TAO_IDL/be/be_null_return_emitter.cpp index ba97a4d4afa..0186e11e2b4 100644 --- a/TAO/TAO_IDL/be/be_null_return_emitter.cpp +++ b/TAO/TAO_IDL/be/be_null_return_emitter.cpp @@ -25,10 +25,6 @@ #include "be_structure.h" #include "be_union.h" -ACE_RCSID (be, - be_null_return_emitter, - "$Id$") - be_null_return_emitter::be_null_return_emitter ( be_visitor_context *ctx) : ctx_ (ctx), diff --git a/TAO/TAO_IDL/be/be_operation_strategy.cpp b/TAO/TAO_IDL/be/be_operation_strategy.cpp index 95ec61dc61c..1008aa46239 100644 --- a/TAO/TAO_IDL/be/be_operation_strategy.cpp +++ b/TAO/TAO_IDL/be/be_operation_strategy.cpp @@ -20,10 +20,6 @@ #include "be_operation_strategy.h" #include "be_operation.h" -ACE_RCSID (be, - be_operation_strategy, - "$Id$") - be_operation_strategy::be_operation_strategy (be_operation *node, Strategy_Kind strategy_type) : node_ (node), @@ -173,6 +169,7 @@ be_operation_ami_sendc_strategy::marshaling (void) return marshaling_; } + be_operation* be_operation_ami_sendc_strategy::arguments (void) { @@ -360,7 +357,8 @@ be_operation_amh_strategy::arguments (void) int be_operation_amh_strategy::has_extra_code_generation ( - TAO_CodeGen::CG_STATE) + TAO_CodeGen::CG_STATE + ) { return 0; } diff --git a/TAO/TAO_IDL/be/be_predefined_type.cpp b/TAO/TAO_IDL/be/be_predefined_type.cpp index 7b7ef968486..ddafa56322d 100644 --- a/TAO/TAO_IDL/be/be_predefined_type.cpp +++ b/TAO/TAO_IDL/be/be_predefined_type.cpp @@ -29,10 +29,6 @@ #include "ace/ACE.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (be, - be_predefined_type, - "$Id$") - be_predefined_type::be_predefined_type (void) : COMMON_Base (), AST_Decl (), diff --git a/TAO/TAO_IDL/be/be_root.cpp b/TAO/TAO_IDL/be/be_root.cpp index dab2e285df8..5dd4d417e8d 100644 --- a/TAO/TAO_IDL/be/be_root.cpp +++ b/TAO/TAO_IDL/be/be_root.cpp @@ -25,10 +25,6 @@ #include "ast_string.h" #include "ast_array.h" -ACE_RCSID (be, - be_root, - "$Id$") - // Default Constructor. be_root::be_root (void) : COMMON_Base (), diff --git a/TAO/TAO_IDL/be/be_scope.cpp b/TAO/TAO_IDL/be/be_scope.cpp index ce0663c8be7..cd578163c94 100644 --- a/TAO/TAO_IDL/be/be_scope.cpp +++ b/TAO/TAO_IDL/be/be_scope.cpp @@ -13,6 +13,7 @@ #include "be_enum.h" #include "be_operation.h" #include "be_factory.h" +#include "be_finder.h" #include "be_root.h" #include "be_visitor.h" @@ -92,6 +93,8 @@ be_scope::decl (void) return be_operation::narrow_from_scope (this); case AST_Decl::NT_factory: return be_factory::narrow_from_scope (this); + case AST_Decl::NT_finder: + return be_finder::narrow_from_scope (this); default: return (be_decl *)0; } diff --git a/TAO/TAO_IDL/be/be_sequence.cpp b/TAO/TAO_IDL/be/be_sequence.cpp index 63e4bce34e6..76efef6aa72 100644 --- a/TAO/TAO_IDL/be/be_sequence.cpp +++ b/TAO/TAO_IDL/be/be_sequence.cpp @@ -205,7 +205,6 @@ be_sequence::gen_name (void) // template and non-template implementations of IDL sequences. UTL_Scope *parent = this->defined_in (); seq->set_defined_in (parent); - parent->add_sequence (seq); char *seq_name = seq->gen_name (); ACE_OS::sprintf (namebuf, diff --git a/TAO/TAO_IDL/be/be_string.cpp b/TAO/TAO_IDL/be/be_string.cpp index 4be5b3bd792..cffdf94b7d3 100644 --- a/TAO/TAO_IDL/be/be_string.cpp +++ b/TAO/TAO_IDL/be/be_string.cpp @@ -26,10 +26,6 @@ #include "utl_identifier.h" #include "global_extern.h" -ACE_RCSID (be, - be_string, - "$Id$") - be_string::be_string (void) : COMMON_Base (), AST_Decl (), diff --git a/TAO/TAO_IDL/be/be_structure_fwd.cpp b/TAO/TAO_IDL/be/be_structure_fwd.cpp index 5346ffb3f14..1cdcdd30775 100644 --- a/TAO/TAO_IDL/be/be_structure_fwd.cpp +++ b/TAO/TAO_IDL/be/be_structure_fwd.cpp @@ -20,10 +20,6 @@ #include "be_structure_fwd.h" #include "be_visitor.h" -ACE_RCSID (be, - be_structure_fwd, - "$Id$") - be_structure_fwd::be_structure_fwd (void) : COMMON_Base (), AST_Decl (), diff --git a/TAO/TAO_IDL/be/be_type.cpp b/TAO/TAO_IDL/be/be_type.cpp index 59799f69749..21ce92cc768 100644 --- a/TAO/TAO_IDL/be/be_type.cpp +++ b/TAO/TAO_IDL/be/be_type.cpp @@ -28,10 +28,6 @@ #include "idl_defines.h" #include "nr_extern.h" -ACE_RCSID (be, - be_type, - "$Id$") - be_type::be_type (void) : COMMON_Base (), AST_Decl (), diff --git a/TAO/TAO_IDL/be/be_union.cpp b/TAO/TAO_IDL/be/be_union.cpp index aa3552f9fd8..642f3b28bea 100644 --- a/TAO/TAO_IDL/be/be_union.cpp +++ b/TAO/TAO_IDL/be/be_union.cpp @@ -33,11 +33,6 @@ #include "idl_defines.h" #include "global_extern.h" -ACE_RCSID (be, - be_union, - "$Id$") - - be_union::be_union (void) : COMMON_Base (), AST_Decl (), diff --git a/TAO/TAO_IDL/be/be_union_branch.cpp b/TAO/TAO_IDL/be/be_union_branch.cpp index aab57f0735c..3e4f8b2065e 100644 --- a/TAO/TAO_IDL/be/be_union_branch.cpp +++ b/TAO/TAO_IDL/be/be_union_branch.cpp @@ -28,10 +28,6 @@ #include "ast_union_label.h" #include "ace/Log_Msg.h" -ACE_RCSID (be, - be_union_branch, - "$Id$") - be_union_branch::be_union_branch (void) : COMMON_Base (), AST_Decl (), diff --git a/TAO/TAO_IDL/be/be_union_fwd.cpp b/TAO/TAO_IDL/be/be_union_fwd.cpp index ee989abaaab..b0296700a57 100644 --- a/TAO/TAO_IDL/be/be_union_fwd.cpp +++ b/TAO/TAO_IDL/be/be_union_fwd.cpp @@ -21,10 +21,6 @@ #include "be_visitor.h" #include "ast_union.h" -ACE_RCSID (be, - be_union_fwd, - "$Id$") - be_union_fwd::be_union_fwd (void) : COMMON_Base (), AST_Decl (), diff --git a/TAO/TAO_IDL/be/be_valuebox.cpp b/TAO/TAO_IDL/be/be_valuebox.cpp index 855c695c4e2..51c91648bd1 100644 --- a/TAO/TAO_IDL/be/be_valuebox.cpp +++ b/TAO/TAO_IDL/be/be_valuebox.cpp @@ -22,10 +22,6 @@ #include "be_visitor.h" #include "global_extern.h" -ACE_RCSID (be, - be_valuebox, - "be_valuebox.cpp Exp") - // Default constructor. be_valuebox::be_valuebox (void) : COMMON_Base (), diff --git a/TAO/TAO_IDL/be/be_valuetype.cpp b/TAO/TAO_IDL/be/be_valuetype.cpp index ae63b7e2678..a37e1db0ddd 100644 --- a/TAO/TAO_IDL/be/be_valuetype.cpp +++ b/TAO/TAO_IDL/be/be_valuetype.cpp @@ -29,10 +29,6 @@ #include "global_extern.h" #include "ace/Log_Msg.h" -ACE_RCSID (be, - be_valuetype, - "$Id$") - // Default constructor. be_valuetype::be_valuetype (void) : COMMON_Base (), diff --git a/TAO/TAO_IDL/be/be_valuetype_fwd.cpp b/TAO/TAO_IDL/be/be_valuetype_fwd.cpp index 609b34f9bd9..5da24b1d6a5 100644 --- a/TAO/TAO_IDL/be/be_valuetype_fwd.cpp +++ b/TAO/TAO_IDL/be/be_valuetype_fwd.cpp @@ -25,10 +25,6 @@ #include "be_visitor.h" #include "ast_interface.h" -ACE_RCSID (be, - be_valuetype_fwd, - "$Id$") - be_valuetype_fwd::be_valuetype_fwd (void) : COMMON_Base (), AST_Decl (), diff --git a/TAO/TAO_IDL/be/be_visitor.cpp b/TAO/TAO_IDL/be/be_visitor.cpp index 264d86a8980..1d4c7871727 100644 --- a/TAO/TAO_IDL/be/be_visitor.cpp +++ b/TAO/TAO_IDL/be/be_visitor.cpp @@ -33,7 +33,8 @@ be_visitor::~be_visitor (void) { } -// all the visit methods. Concrete visitors will selectively override each one +// All the visit methods. Concrete visitors will selectively +// override each one. int be_visitor::visit_decl (be_decl *) { return 0; @@ -207,6 +208,12 @@ be_visitor::visit_factory (be_factory *) } int +be_visitor::visit_finder (be_finder *) +{ + return 0; +} + +int be_visitor::visit_structure (be_structure *) { return 0; diff --git a/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp b/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp index 8bd02c761aa..df008b1f061 100644 --- a/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp +++ b/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp @@ -29,10 +29,6 @@ #include "global_extern.h" #include "ace/Log_Msg.h" -ACE_RCSID (be, - be_visitor_amh_pre_proc, - "$Id$") - be_visitor_amh_pre_proc::be_visitor_amh_pre_proc (be_visitor_context *ctx) : be_visitor_scope (ctx) { 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 f898574c2c0..fa2bbf6b152 100644 --- a/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp +++ b/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp @@ -42,11 +42,6 @@ #include "global_extern.h" #include "ace/Log_Msg.h" -ACE_RCSID (be, - be_visitor_ami_pre_proc, - "$Id$") - - be_visitor_ami_pre_proc::be_visitor_ami_pre_proc (be_visitor_context *ctx) : be_visitor_scope (ctx) { diff --git a/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp b/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp index ad42243dd6e..34e733552d0 100644 --- a/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp +++ b/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp @@ -46,11 +46,6 @@ #include <string> - -ACE_RCSID (be, - be_visitor_arg_traits, - "$Id$") - be_visitor_arg_traits::be_visitor_arg_traits (const char *S, be_visitor_context *ctx) : be_visitor_scope (ctx), diff --git a/TAO/TAO_IDL/be/be_visitor_argument.cpp b/TAO/TAO_IDL/be/be_visitor_argument.cpp index 1024f14f6bd..7bd1587d065 100644 --- a/TAO/TAO_IDL/be/be_visitor_argument.cpp +++ b/TAO/TAO_IDL/be/be_visitor_argument.cpp @@ -56,6 +56,3 @@ #include "be_visitor_argument/invoke_cs.cpp" #include "be_visitor_argument/paramlist.cpp" -ACE_RCSID (be, - be_visitor_argument, - "$Id$") diff --git a/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp b/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp index 475e7598227..2db83d519be 100644 --- a/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp +++ b/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp @@ -18,11 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_argument, - arglist, - "$Id$") - - // ************************************************************ // be_visitor_args_arglist for parameter list in method declarations and // definitions diff --git a/TAO/TAO_IDL/be/be_visitor_argument/argument.cpp b/TAO/TAO_IDL/be/be_visitor_argument/argument.cpp index 8ec03e0e1b8..86af051c62d 100644 --- a/TAO/TAO_IDL/be/be_visitor_argument/argument.cpp +++ b/TAO/TAO_IDL/be/be_visitor_argument/argument.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_argument, - argument, - "$Id$") - be_visitor_args::be_visitor_args (be_visitor_context *ctx) : be_visitor_decl (ctx), fixed_direction_ (-1) @@ -37,9 +33,9 @@ int be_visitor_args::visit_argument (be_argument *) return -1; } -// helper that returns the type name either as a nested type name (for header +// Helper that returns the type name either as a nested type name (for header // files) or as a fully scoped name. In addition, we make sure that if the type -// is an alias, we use that name +// is an alias, we use that name. const char * be_visitor_args::type_name (be_type *node, const char *suffix) @@ -74,7 +70,7 @@ be_visitor_args::type_name (be_type *node, return namebuf; } -// helper that returns the direction type of the argument +// Helper that returns the direction type of the argument AST_Argument::Direction be_visitor_args::direction (void) { @@ -83,11 +79,11 @@ be_visitor_args::direction (void) return AST_Argument::Direction (this->fixed_direction_); } - // grab the argument node. We know that our context has stored the right - // argument node - be_argument *arg = this->ctx_->be_node_as_argument (); + // Grab the argument node. We know that our context has stored the right + // argument node. + be_argument *arg = + be_argument::narrow_from_decl (this->ctx_->node ()); - ACE_ASSERT (arg != 0); return arg->direction (); } diff --git a/TAO/TAO_IDL/be/be_visitor_argument/invoke_cs.cpp b/TAO/TAO_IDL/be/be_visitor_argument/invoke_cs.cpp index 4001e6417e9..75e391863b6 100644 --- a/TAO/TAO_IDL/be/be_visitor_argument/invoke_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_argument/invoke_cs.cpp @@ -18,11 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_argument, - invoke_cs, - "$Id$") - - // **************************************************************************** // visitor for arguments passing to the CDR operators. // **************************************************************************** @@ -138,7 +133,8 @@ int be_visitor_args_invoke_cs::visit_argument (be_argument *node) int be_visitor_args_invoke_cs::visit_array (be_array *node) { TAO_OutStream *os = this->ctx_->stream (); - be_argument *arg = this->ctx_->be_node_as_argument (); + be_argument *arg = + be_argument::narrow_from_decl (this->ctx_->node ()); if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_OUTPUT) { @@ -184,7 +180,8 @@ int be_visitor_args_invoke_cs::visit_array (be_array *node) int be_visitor_args_invoke_cs::visit_enum (be_enum *) { TAO_OutStream *os = this->ctx_->stream (); - be_argument *arg = this->ctx_->be_node_as_argument (); + be_argument *arg = + be_argument::narrow_from_decl (this->ctx_->node ()); if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_OUTPUT) { @@ -251,7 +248,8 @@ be_visitor_args_invoke_cs::visit_valuetype_fwd (be_valuetype_fwd *) int be_visitor_args_invoke_cs::visit_predefined_type (be_predefined_type *node) { TAO_OutStream *os = this->ctx_->stream (); - be_argument *arg = this->ctx_->be_node_as_argument (); + be_argument *arg = + be_argument::narrow_from_decl (this->ctx_->node ()); if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_OUTPUT) { @@ -400,7 +398,8 @@ int be_visitor_args_invoke_cs::visit_predefined_type (be_predefined_type *node) int be_visitor_args_invoke_cs::visit_sequence (be_sequence *) { TAO_OutStream *os = this->ctx_->stream (); - be_argument *arg = this->ctx_->be_node_as_argument (); + be_argument *arg = + be_argument::narrow_from_decl (this->ctx_->node ()); if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_OUTPUT) { @@ -443,7 +442,8 @@ int be_visitor_args_invoke_cs::visit_sequence (be_sequence *) int be_visitor_args_invoke_cs::visit_string (be_string *node) { TAO_OutStream *os = this->ctx_->stream (); - be_argument *arg = this->ctx_->be_node_as_argument (); + be_argument *arg = + be_argument::narrow_from_decl (this->ctx_->node ()); if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_OUTPUT) { @@ -594,7 +594,8 @@ be_visitor_args_invoke_cs::visit_home ( int be_visitor_args_invoke_cs::emit_common (void) { TAO_OutStream *os = this->ctx_->stream (); - be_argument *arg = this->ctx_->be_node_as_argument (); + be_argument *arg = + be_argument::narrow_from_decl (this->ctx_->node ()); if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_OUTPUT) { @@ -637,7 +638,8 @@ int be_visitor_args_invoke_cs::emit_common (void) int be_visitor_args_invoke_cs::emit_common2 (be_type *node) { TAO_OutStream *os = this->ctx_->stream (); - be_argument *arg = this->ctx_->be_node_as_argument (); + be_argument *arg = + be_argument::narrow_from_decl (this->ctx_->node ()); if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_OUTPUT) { diff --git a/TAO/TAO_IDL/be/be_visitor_argument/marshal_ss.cpp b/TAO/TAO_IDL/be/be_visitor_argument/marshal_ss.cpp index 39ea6f27f8c..e17232b832d 100644 --- a/TAO/TAO_IDL/be/be_visitor_argument/marshal_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_argument/marshal_ss.cpp @@ -19,11 +19,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_argument, - marshal_ss, - "$Id$") - - // ************************************************************************ // Visitor to generate code for passing argument to the marshal/demarshal // routines @@ -140,7 +135,8 @@ int be_visitor_args_marshal_ss::visit_argument (be_argument *node) int be_visitor_args_marshal_ss::visit_array (be_array *) { TAO_OutStream *os = this->ctx_->stream (); - be_argument *arg = this->ctx_->be_node_as_argument (); + be_argument *arg = + be_argument::narrow_from_decl (this->ctx_->node ()); if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_INPUT) { @@ -185,7 +181,8 @@ int be_visitor_args_marshal_ss::visit_array (be_array *) int be_visitor_args_marshal_ss::visit_enum (be_enum *) { TAO_OutStream *os = this->ctx_->stream (); - be_argument *arg = this->ctx_->be_node_as_argument (); + be_argument *arg = + be_argument::narrow_from_decl (this->ctx_->node ()); if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_INPUT) { @@ -253,7 +250,8 @@ int be_visitor_args_marshal_ss::visit_predefined_type ( ) { TAO_OutStream *os = this->ctx_->stream (); - be_argument *arg = this->ctx_->be_node_as_argument (); + be_argument *arg = + be_argument::narrow_from_decl (this->ctx_->node ()); if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_INPUT) { @@ -411,7 +409,8 @@ int be_visitor_args_marshal_ss::visit_predefined_type ( int be_visitor_args_marshal_ss::visit_sequence (be_sequence *) { TAO_OutStream *os = this->ctx_->stream (); - be_argument *arg = this->ctx_->be_node_as_argument (); + be_argument *arg = + be_argument::narrow_from_decl (this->ctx_->node ()); if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_INPUT) { @@ -454,7 +453,8 @@ int be_visitor_args_marshal_ss::visit_sequence (be_sequence *) int be_visitor_args_marshal_ss::visit_string (be_string *node) { TAO_OutStream *os = this->ctx_->stream (); - be_argument *arg = this->ctx_->be_node_as_argument (); + be_argument *arg = + be_argument::narrow_from_decl (this->ctx_->node ()); if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_INPUT) { @@ -607,10 +607,11 @@ be_visitor_args_marshal_ss::visit_home ( } int -be_visitor_args_marshal_ss::emit_common () +be_visitor_args_marshal_ss::emit_common (void) { TAO_OutStream *os = this->ctx_->stream (); - be_argument *arg = this->ctx_->be_node_as_argument (); + be_argument *arg = + be_argument::narrow_from_decl (this->ctx_->node ()); if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_INPUT) { @@ -652,7 +653,8 @@ int be_visitor_args_marshal_ss::emit_common2 (be_type *node) { TAO_OutStream *os = this->ctx_->stream (); - be_argument *arg = this->ctx_->be_node_as_argument (); + be_argument *arg = + be_argument::narrow_from_decl (this->ctx_->node ()); if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_INPUT) { diff --git a/TAO/TAO_IDL/be/be_visitor_argument/paramlist.cpp b/TAO/TAO_IDL/be/be_visitor_argument/paramlist.cpp index e8f10292638..483f6a93f8a 100644 --- a/TAO/TAO_IDL/be/be_visitor_argument/paramlist.cpp +++ b/TAO/TAO_IDL/be/be_visitor_argument/paramlist.cpp @@ -19,11 +19,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_argument, - paramlist, - "$Id$") - - // ************************************************************ // be_visitor_args_paramlist for parameter list in method declarations and // definitions @@ -174,7 +169,8 @@ be_visitor_args_paramlist::visit_string (be_string *node) TAO_OutStream *os = this->ctx_->stream (); // Get the argument. - be_argument *arg = this->ctx_->be_node_as_argument (); + be_argument *arg = + be_argument::narrow_from_decl (this->ctx_->node ()); // We need to make a distinction between bounded and unbounded strings. if (node->max_size ()->ev ()->u.ulval != 0) @@ -202,13 +198,15 @@ be_visitor_args_paramlist::visit_string (be_string *node) } int -be_visitor_args_paramlist::visit_predefined_type (be_predefined_type *node) +be_visitor_args_paramlist::visit_predefined_type ( + be_predefined_type *node) { // Get output stream. TAO_OutStream *os = this->ctx_->stream (); // Get the argument. - be_argument *arg = this->ctx_->be_node_as_argument (); + be_argument *arg = + be_argument::narrow_from_decl (this->ctx_->node ()); switch (node->pt ()) { diff --git a/TAO/TAO_IDL/be/be_visitor_argument/post_upcall_ss.cpp b/TAO/TAO_IDL/be/be_visitor_argument/post_upcall_ss.cpp index 41c9e5b9d10..5e4b97c1144 100644 --- a/TAO/TAO_IDL/be/be_visitor_argument/post_upcall_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_argument/post_upcall_ss.cpp @@ -19,10 +19,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_argument, - post_upcall_ss, - "$Id$") - // ************************************************************************ // visitor for doing any post-processing after the upcall is made // ************************************************************************ @@ -78,7 +74,8 @@ int be_visitor_args_post_upcall_ss::visit_argument (be_argument *node) int be_visitor_args_post_upcall_ss::visit_array (be_array *node) { TAO_OutStream *os = this->ctx_->stream (); - be_argument *arg = this->ctx_->be_node_as_argument (); + be_argument *arg = + be_argument::narrow_from_decl (this->ctx_->node ()); // if the current type is an alias, use that be_type *bt = node; diff --git a/TAO/TAO_IDL/be/be_visitor_argument/upcall_ss.cpp b/TAO/TAO_IDL/be/be_visitor_argument/upcall_ss.cpp index e5b9a0f45f5..d841311612f 100644 --- a/TAO/TAO_IDL/be/be_visitor_argument/upcall_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_argument/upcall_ss.cpp @@ -19,11 +19,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_argument, - upcall_ss, - "$Id$") - - // ************************************************************************ // visitor for passing arguments to the upcall // ************************************************************************ @@ -72,7 +67,8 @@ int be_visitor_args_upcall_ss::visit_argument (be_argument *node) int be_visitor_args_upcall_ss::visit_array (be_array *node) { TAO_OutStream *os = this->ctx_->stream (); - be_argument *arg = this->ctx_->be_node_as_argument (); + be_argument *arg = + be_argument::narrow_from_decl (this->ctx_->node ()); switch (this->direction ()) { @@ -118,7 +114,8 @@ int be_visitor_args_upcall_ss::visit_array (be_array *node) int be_visitor_args_upcall_ss::visit_enum (be_enum *) { TAO_OutStream *os = this->ctx_->stream (); - be_argument *arg = this->ctx_->be_node_as_argument (); + be_argument *arg = + be_argument::narrow_from_decl (this->ctx_->node ()); switch (this->direction ()) { @@ -153,15 +150,18 @@ int be_visitor_args_upcall_ss::visit_valuetype (be_valuetype *) return this->emit_common (); } -int be_visitor_args_upcall_ss::visit_valuetype_fwd (be_valuetype_fwd *) +int be_visitor_args_upcall_ss::visit_valuetype_fwd ( + be_valuetype_fwd *) { return this->emit_common (); } -int be_visitor_args_upcall_ss::visit_predefined_type (be_predefined_type *node) +int be_visitor_args_upcall_ss::visit_predefined_type ( + be_predefined_type *node) { TAO_OutStream *os = this->ctx_->stream (); - be_argument *arg = this->ctx_->be_node_as_argument (); + be_argument *arg = + be_argument::narrow_from_decl (this->ctx_->node ()); AST_PredefinedType::PredefinedType pt = node->pt (); if (pt == AST_PredefinedType::PT_any) @@ -249,7 +249,8 @@ int be_visitor_args_upcall_ss::visit_predefined_type (be_predefined_type *node) int be_visitor_args_upcall_ss::visit_sequence (be_sequence *) { TAO_OutStream *os = this->ctx_->stream (); - be_argument *arg = this->ctx_->be_node_as_argument (); + be_argument *arg = + be_argument::narrow_from_decl (this->ctx_->node ()); switch (this->direction ()) { @@ -342,7 +343,8 @@ be_visitor_args_upcall_ss::visit_eventtype_fwd ( int be_visitor_args_upcall_ss::emit_common (void) { TAO_OutStream *os = this->ctx_->stream (); - be_argument *arg = this->ctx_->be_node_as_argument (); + be_argument *arg = + be_argument::narrow_from_decl (this->ctx_->node ()); switch (this->direction ()) { @@ -390,7 +392,8 @@ int be_visitor_args_upcall_ss::emit_common (void) int be_visitor_args_upcall_ss::emit_common2 (be_type *node) { TAO_OutStream *os = this->ctx_->stream (); - be_argument *arg = this->ctx_->be_node_as_argument (); + be_argument *arg = + be_argument::narrow_from_decl (this->ctx_->node ()); switch (this->direction ()) { diff --git a/TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp b/TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp index c1846c2fda7..a42e88a3632 100644 --- a/TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp @@ -19,11 +19,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_argument, - vardecl_ss, - "$Id$") - - // ************************************************************************ // Visitor to generate code for argument variable declaration // ************************************************************************ @@ -74,7 +69,8 @@ int be_visitor_args_vardecl_ss::visit_argument (be_argument *node) int be_visitor_args_vardecl_ss::visit_array (be_array *node) { TAO_OutStream *os = this->ctx_->stream (); - be_argument *arg = this->ctx_->be_node_as_argument (); + be_argument *arg = + be_argument::narrow_from_decl (this->ctx_->node ()); be_type *bt = 0; if (this->ctx_->alias ()) @@ -118,7 +114,8 @@ int be_visitor_args_vardecl_ss::visit_array (be_array *node) int be_visitor_args_vardecl_ss::visit_enum (be_enum *node) { TAO_OutStream *os = this->ctx_->stream (); - be_argument *arg = this->ctx_->be_node_as_argument (); + be_argument *arg = + be_argument::narrow_from_decl (this->ctx_->node ()); be_type *bt = 0; if (this->ctx_->alias ()) @@ -172,7 +169,8 @@ int be_visitor_args_vardecl_ss::visit_valuetype_fwd (be_valuetype_fwd *node) int be_visitor_args_vardecl_ss::visit_predefined_type (be_predefined_type *node) { TAO_OutStream *os = this->ctx_->stream (); - be_argument *arg = this->ctx_->be_node_as_argument (); + be_argument *arg = + be_argument::narrow_from_decl (this->ctx_->node ()); be_type *bt = 0; if (this->ctx_->alias ()) @@ -257,7 +255,8 @@ int be_visitor_args_vardecl_ss::visit_predefined_type (be_predefined_type *node) int be_visitor_args_vardecl_ss::visit_sequence (be_sequence *node) { TAO_OutStream *os = this->ctx_->stream (); - be_argument *arg = this->ctx_->be_node_as_argument (); + be_argument *arg = + be_argument::narrow_from_decl (this->ctx_->node ()); be_type *bt = 0; if (this->ctx_->alias ()) @@ -289,7 +288,8 @@ int be_visitor_args_vardecl_ss::visit_sequence (be_sequence *node) int be_visitor_args_vardecl_ss::visit_string (be_string *node) { TAO_OutStream *os = this->ctx_->stream (); - be_argument *arg = this->ctx_->be_node_as_argument (); + be_argument *arg = + be_argument::narrow_from_decl (this->ctx_->node ()); switch (this->direction ()) { @@ -385,7 +385,8 @@ int be_visitor_args_vardecl_ss::emit_common (be_type *node) { TAO_OutStream *os = this->ctx_->stream (); - be_argument *arg = this->ctx_->be_node_as_argument (); + be_argument *arg = + be_argument::narrow_from_decl (this->ctx_->node ()); be_type *bt = 0; if (this->ctx_->alias ()) @@ -420,7 +421,8 @@ int be_visitor_args_vardecl_ss::emit_common2 (be_type *node) { TAO_OutStream *os = this->ctx_->stream (); - be_argument *arg = this->ctx_->be_node_as_argument (); + be_argument *arg = + be_argument::narrow_from_decl (this->ctx_->node ()); be_type *bt = 0; if (this->ctx_->alias ()) diff --git a/TAO/TAO_IDL/be/be_visitor_array/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_array/any_op_ch.cpp index b3ec2642578..dc7d7802227 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/any_op_ch.cpp @@ -19,10 +19,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_array, - any_op_ch, - "$Id$") - // *************************************************************************** // Array visitor for generating Any operator declarations in the client header // *************************************************************************** diff --git a/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp index 2941a15de99..29ec9660a71 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp @@ -19,11 +19,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_array, - any_op_cs, - "$Id$") - - // *************************************************************************** // Array visitor for generating Any operator declarations in the client // stubs file diff --git a/TAO/TAO_IDL/be/be_visitor_array/array.cpp b/TAO/TAO_IDL/be/be_visitor_array/array.cpp index 5ea63d3fbc9..4704c4b9e46 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/array.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/array.cpp @@ -18,11 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_array, - array, - "$Id$") - - // ************************************************************************ // generic visitor for array declaration // ************************************************************************ 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 2362c37dff6..dee165a8458 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp @@ -14,11 +14,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_array, - array_ci, - "$Id$") - - // ************************************************************************ // visitor for array declaration in client inline // ************************************************************************ 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 7a4a4900be9..d630e902407 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_array, - array_cs, - "$Id$") - // ************************************************************************ // visitor for array declaration in client stubs // ************************************************************************ diff --git a/TAO/TAO_IDL/be/be_visitor_array/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_array/cdr_op_ch.cpp index 9cf85191781..8b0b350c9e2 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/cdr_op_ch.cpp @@ -21,10 +21,6 @@ #include "be_visitor_sequence/cdr_op_ch.h" -ACE_RCSID (be_visitor_array, - cdr_op_ch, - "$Id$") - // *************************************************************************** // Array visitor for generating CDR operator declarations in the client header // *************************************************************************** diff --git a/TAO/TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp index 0c975f942ed..7a1fb7b9e5b 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp @@ -19,10 +19,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_array, - cdr_op_cs, - "$Id$") - // *************************************************************************** // Array visitor for generating CDR operator declarations in the client // stubs file @@ -268,7 +264,8 @@ be_visitor_array_cdr_op_cs::visit_valuetype_fwd (be_valuetype_fwd *node) } int -be_visitor_array_cdr_op_cs::visit_predefined_type (be_predefined_type *node) +be_visitor_array_cdr_op_cs::visit_predefined_type ( + be_predefined_type *node) { TAO_OutStream *os = this->ctx_->stream (); @@ -301,9 +298,10 @@ be_visitor_array_cdr_op_cs::visit_predefined_type (be_predefined_type *node) unsigned long i; // Grab the array node. - be_array *array = this->ctx_->be_node_as_array (); + be_array *array = + be_array::narrow_from_decl (this->ctx_->node ()); - if (!node) + if (array == 0) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_array_cdr_op_cs::" @@ -567,10 +565,11 @@ be_visitor_array_cdr_op_cs::visit_node (be_type *bt) { TAO_OutStream *os = this->ctx_->stream (); ACE_CDR::ULong i; - be_array *node = this->ctx_->be_node_as_array (); + be_array *node = + be_array::narrow_from_decl (this->ctx_->node ()); AST_Decl::NodeType nt = bt->node_type (); - if (!node) + if (node == 0) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_array_cdr_op_cs::" diff --git a/TAO/TAO_IDL/be/be_visitor_array/serializer_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_array/serializer_op_ch.cpp index 33dda140d8c..1f7fc28c505 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/serializer_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/serializer_op_ch.cpp @@ -21,10 +21,6 @@ #include "be_visitor_sequence/serializer_op_ch.h" -ACE_RCSID (be_visitor_array, - serializer_op_ch, - "$Id$") - // *************************************************************************** // Array visitor for generating Serializer operator declarations in the client header // *************************************************************************** diff --git a/TAO/TAO_IDL/be/be_visitor_array/serializer_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_array/serializer_op_cs.cpp index 15b2357003f..91b82078977 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/serializer_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/serializer_op_cs.cpp @@ -20,10 +20,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_array, - serializer_op_cs, - "$Id$") - // *************************************************************************** // Array visitor for generating Serializer operator declarations in the client // stubs file @@ -284,9 +280,10 @@ be_visitor_array_serializer_op_cs::visit_enum (be_enum *node) unsigned long i; // Grab the array node. - be_array *array = this->ctx_->be_node_as_array (); + be_array *array = + be_array::narrow_from_decl (this->ctx_->node ()); - if (!node) + if (array == 0) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_array_serializer_op_cs::" @@ -419,9 +416,10 @@ be_visitor_array_serializer_op_cs::visit_predefined_type ( unsigned long i; // Grab the array node. - be_array *array = this->ctx_->be_node_as_array (); + be_array *array = + be_array::narrow_from_decl (this->ctx_->node ()); - if (!node) + if (array == 0) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_array_serializer_op_cs::" @@ -753,10 +751,11 @@ be_visitor_array_serializer_op_cs::visit_node (be_type *bt) { TAO_OutStream *os = this->ctx_->stream (); ACE_CDR::ULong i; - be_array *node = this->ctx_->be_node_as_array (); + be_array *node = + be_array::narrow_from_decl (this->ctx_->node ()); AST_Decl::NodeType nt = bt->node_type (); - if (!node) + if (node == 0) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_array_serializer_op_cs::" 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 629100adadc..a1483d44e5c 100644 --- a/TAO/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp +++ b/TAO/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp @@ -9,6 +9,7 @@ #include "be_visitor_ccm_pre_proc.h" #include "be_visitor_context.h" +#include "be_visitor_xplicit_pre_proc.h" #include "be_root.h" #include "be_operation.h" #include "be_argument.h" @@ -32,6 +33,7 @@ #include "be_eventtype.h" #include "be_eventtype_fwd.h" #include "be_home.h" +#include "be_finder.h" #include "be_extern.h" #include "ast_generator.h" @@ -336,6 +338,11 @@ be_visitor_ccm_pre_proc::visit_consumes (be_consumes *node) int be_visitor_ccm_pre_proc::visit_home (be_home *node) { + if (node->imported ()) + { + return 0; + } + AST_Interface *xplicit = this->create_explicit (node); if (xplicit == 0) @@ -358,24 +365,6 @@ be_visitor_ccm_pre_proc::visit_home (be_home *node) -1); } - if (this->gen_factories (node, xplicit) == -1) - { - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("be_visitor_ccm_pre_proc::") - ACE_TEXT ("visit_home - code generation ") - ACE_TEXT ("for factories declarations failed\n")), - -1); - } - - if (this->gen_finders (node, xplicit) == -1) - { - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("be_visitor_ccm_pre_proc::") - ACE_TEXT ("visit_home - code generation ") - ACE_TEXT ("for finders declarations failed\n")), - -1); - } - if (this->gen_implicit_ops (node, implicit) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -429,84 +418,6 @@ be_visitor_ccm_pre_proc::visit_eventtype_fwd (be_eventtype_fwd *node) } int -be_visitor_ccm_pre_proc::gen_factories (be_home *node, - AST_Interface *xplicit) -{ - AST_Operation **item = 0; - - for (ACE_Unbounded_Queue_Iterator<AST_Operation *> i (node->factories ()); - ! i.done (); - i.advance ()) - { - i.next (item); - be_operation *op = be_operation::narrow_from_decl (*item); - - op->set_defined_in (xplicit); - UTL_ScopedName *new_name = - this->create_scoped_name (0, - op->local_name ()->get_string (), - 0, - xplicit); - op->set_name (new_name); - - if (op->be_insert_exception (this->create_failure_) == -1) - { - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("be_visitor_ccm_pre_proc::") - ACE_TEXT ("gen_factories - ") - ACE_TEXT ("exception insertion failed\n")), - -1); - } - - if (0 == xplicit->be_add_operation (op)) - { - return -1; - } - } - - return 0; -} - -int -be_visitor_ccm_pre_proc::gen_finders (be_home *node, - AST_Interface *xplicit) -{ - AST_Operation **item = 0; - - for (ACE_Unbounded_Queue_Iterator<AST_Operation *> i (node->finders ()); - ! i.done (); - i.advance ()) - { - i.next (item); - be_operation *op = be_operation::narrow_from_decl (*item); - - op->set_defined_in (xplicit); - UTL_ScopedName *new_name = - this->create_scoped_name (0, - op->local_name ()->get_string (), - 0, - xplicit); - (*item)->set_name (new_name); - - if (op->be_insert_exception (this->finder_failure_) == -1) - { - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("be_visitor_ccm_pre_proc::") - ACE_TEXT ("gen_factories - ") - ACE_TEXT ("exception insertion failed\n")), - -1); - } - - if (0 == xplicit->be_add_operation (op)) - { - return -1; - } - } - - return 0; -} - -int be_visitor_ccm_pre_proc::gen_implicit_ops (be_home *node, AST_Interface *implicit) { @@ -1551,73 +1462,18 @@ be_visitor_ccm_pre_proc::lookup_consumer (be_field *node) AST_Interface * be_visitor_ccm_pre_proc::create_explicit (be_home *node) { - UTL_NameList *parent_list = this->compute_inheritance (node); - FE_InterfaceHeader header (0, - parent_list, - 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 - // interface construction time. - idl_global->scopes ().push (node->defined_in ()); - - UTL_ScopedName *explicit_name = - this->create_scoped_name (0, - node->local_name (), - "Explicit", - ScopeAsDecl (node->defined_in ())); - - be_interface *i = 0; - ACE_NEW_RETURN (i, - be_interface (explicit_name, - header.inherits (), - header.n_inherits (), - header.inherits_flat (), - header.n_inherits_flat (), - false, - false), - 0); - - // Back to reality. - idl_global->scopes ().pop (); - - i->set_name (explicit_name); - i->set_defined_in (node->defined_in ()); - i->set_imported (node->imported ()); - i->gen_fwd_helper_name (); - i->original_interface (node); - - // Reuse the home's decls in the explicit interface. No need - // to check for name clashes, redefinition, etc. because it - // has already been done in the home and the explicit interface - // is empty at this point. Later addition of factory and finder - // operations will do these checks to make sure they don't - // clash with the other decls. - for (UTL_ScopeActiveIterator iter (node, UTL_Scope::IK_decls); - ! iter.is_done (); - iter.next ()) + be_visitor_xplicit_pre_proc v (this->ctx_); + + if (v.visit_home (node) != 0) { - AST_Decl *d = iter.item (); - d->set_defined_in (i); - UTL_ScopedName *new_name = - this->create_scoped_name (0, - d->local_name ()->get_string (), - 0, - i); - d->set_name (new_name); - i->add_to_scope (d); + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("be_visitor_ccm_pre_proc::") + ACE_TEXT ("create_explicit - ") + ACE_TEXT ("home xplicit visitor failed\n")), + 0); } - header.destroy (); - parent_list->destroy (); - delete parent_list; - parent_list = 0; - - AST_Module *m = AST_Module::narrow_from_scope (node->defined_in ()); - m->be_add_interface (i); - return i; + return v.xplicit (); } AST_Interface * diff --git a/TAO/TAO_IDL/be/be_visitor_component/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_component/any_op_ch.cpp index ff140c4ab35..36f5b2a67be 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/any_op_ch.cpp @@ -19,10 +19,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_component, - any_op_ch, - "$Id$") - // *************************************************************************** // Interface visitor for generating Any operator declarations in the client header // *************************************************************************** diff --git a/TAO/TAO_IDL/be/be_visitor_component/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_component/any_op_cs.cpp index 9abc8f02047..c36c29ac149 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/any_op_cs.cpp @@ -17,10 +17,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_component, - any_op_cs, - "$Id$") - // *************************************************************************** // Interface visitor for generating Any operator declarations in the client // stubs file diff --git a/TAO/TAO_IDL/be/be_visitor_component/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_component/cdr_op_ch.cpp index eba4a289938..4a57cd55075 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/cdr_op_ch.cpp @@ -19,10 +19,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_component, - cdr_op_ch, - "$Id$") - // *************************************************************************** // Interface visitor for generating CDR operator declarations in the client header // *************************************************************************** diff --git a/TAO/TAO_IDL/be/be_visitor_component/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_component/cdr_op_cs.cpp index d69ae7b8a06..f1dd5115857 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/cdr_op_cs.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_component, - cdr_op_cs, - "$Id$") - be_visitor_component_cdr_op_cs::be_visitor_component_cdr_op_cs ( be_visitor_context *ctx ) diff --git a/TAO/TAO_IDL/be/be_visitor_component/component.cpp b/TAO/TAO_IDL/be/be_visitor_component/component.cpp index d92ae2c5538..628caf2e8d3 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/component.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/component.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_component, - component, - "$Id$") - // ****************************************************** // Generic Component visitor // ****************************************************** 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 51ee32f8f5b..7a2a97285fe 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/component_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/component_ch.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_component, - component_ch, - "$Id$") - // ****************************************************** // Component visitor for client header // ****************************************************** 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 2942c4cc72f..39a33aceba8 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/component_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/component_ci.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_component, - component_ci, - "$Id$") - // ****************************************************** // Component visitor for client inline // ****************************************************** 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 8909a3aa37c..9f4c0268238 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_component, - component_cs, - "$Id$") - // ****************************************************** // Component visitor for client stub // ****************************************************** diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_ih.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_ih.cpp index 9b710986475..22b706e0e34 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/component_ih.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/component_ih.cpp @@ -16,10 +16,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_component, - component_ih, - "$Id$") - // ************************************************************ // Interface visitor for implementation header. // ************************************************************ diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_is.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_is.cpp index 5acd37d6a98..c50608ab8b2 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/component_is.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/component_is.cpp @@ -21,10 +21,6 @@ // Component visitor for implementation skeletons. // ************************************************************ -ACE_RCSID (be_visitor_component, - component_is, - "$Id$") - be_visitor_component_is::be_visitor_component_is (be_visitor_context *ctx) : be_visitor_component (ctx) { 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 2d5bb5d1e33..c6d123ce6d0 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/component_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/component_sh.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_component, - component_sh, - "$Id$") - // ****************************************************** // Component visitor for server header // ****************************************************** diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_si.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_si.cpp index 1e54cc1218e..2ad22217bb7 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/component_si.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/component_si.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_component, - component_si, - "$Id$") - // ****************************************************** // Component visitor for server inline // ****************************************************** diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_ss.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_ss.cpp index e318af98c75..e32740fa71c 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/component_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/component_ss.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_component, - component_ss, - "$Id$") - // ****************************************************** // Component visitor for server skeleton // ****************************************************** diff --git a/TAO/TAO_IDL/be/be_visitor_component_fwd.cpp b/TAO/TAO_IDL/be/be_visitor_component_fwd.cpp index baf29faad36..b3d86bdfb29 100644 --- a/TAO/TAO_IDL/be/be_visitor_component_fwd.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component_fwd.cpp @@ -29,7 +29,3 @@ #include "be_visitor_component_fwd/any_op_ch.cpp" #include "be_visitor_component_fwd/cdr_op_ch.cpp" -ACE_RCSID (be, - be_visitor_component_fwd, - "$Id$") - diff --git a/TAO/TAO_IDL/be/be_visitor_component_fwd/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_component_fwd/any_op_ch.cpp index bfa9474be87..533745497dd 100644 --- a/TAO/TAO_IDL/be/be_visitor_component_fwd/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component_fwd/any_op_ch.cpp @@ -19,10 +19,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_component_fwd, - any_op_ch, - "$Id$") - // *************************************************************************** // Generates Any operator declarations in the client header // *************************************************************************** diff --git a/TAO/TAO_IDL/be/be_visitor_component_fwd/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_component_fwd/cdr_op_ch.cpp index b532b2f8248..15208fd4dbb 100644 --- a/TAO/TAO_IDL/be/be_visitor_component_fwd/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component_fwd/cdr_op_ch.cpp @@ -19,10 +19,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_component_fwd, - cdr_op_ch, - "$Id$") - // *************************************************************************** // Forward declared component visitor for generating CDR operator declarations // in the client header. Called if this node is not later defined in the file. diff --git a/TAO/TAO_IDL/be/be_visitor_component_fwd/component_fwd_ch.cpp b/TAO/TAO_IDL/be/be_visitor_component_fwd/component_fwd_ch.cpp index 8e3336853b4..40dca91d12b 100644 --- a/TAO/TAO_IDL/be/be_visitor_component_fwd/component_fwd_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component_fwd/component_fwd_ch.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_component_fwd, - component_fwd_ch, - "$Id$") - // ******************************************************************** // Visitor implementation for the Component_Fwd type // This one for the client header file diff --git a/TAO/TAO_IDL/be/be_visitor_constant.cpp b/TAO/TAO_IDL/be/be_visitor_constant.cpp index 31fe34ea8fc..1eaab214b95 100644 --- a/TAO/TAO_IDL/be/be_visitor_constant.cpp +++ b/TAO/TAO_IDL/be/be_visitor_constant.cpp @@ -31,7 +31,3 @@ #include "be_visitor_constant/constant_ch.cpp" #include "be_visitor_constant/constant_cs.cpp" -ACE_RCSID (be, - be_visitor_constant, - "$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 87eb012138e..93969c3609a 100644 --- a/TAO/TAO_IDL/be/be_visitor_constant/constant_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_constant/constant_ch.cpp @@ -18,11 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_constant, - constant_ch, - "$Id$") - - // ******************************************************************** // Visitor implementation for the Constant type // This one for the client header file 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 194e193a38f..186f630e365 100644 --- a/TAO/TAO_IDL/be/be_visitor_constant/constant_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_constant/constant_cs.cpp @@ -18,11 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_constant, - constant_cs, - "$Id$") - - // ******************************************************************** // Visitor implementation for the Constant type // This one for the client stubs file diff --git a/TAO/TAO_IDL/be/be_visitor_context.cpp b/TAO/TAO_IDL/be/be_visitor_context.cpp index b7b41d1781a..e5ebd0acaa5 100644 --- a/TAO/TAO_IDL/be/be_visitor_context.cpp +++ b/TAO/TAO_IDL/be/be_visitor_context.cpp @@ -18,29 +18,8 @@ // // ============================================================================ -#include "be_argument.h" -#include "be_array.h" -#include "be_attribute.h" -#include "be_constant.h" -#include "be_enum.h" -#include "be_enum_val.h" -#include "be_exception.h" -#include "be_extern.h" -#include "be_field.h" -#include "be_interface.h" -#include "be_interface_fwd.h" -#include "be_module.h" -#include "be_operation.h" -#include "be_predefined_type.h" -#include "be_root.h" -#include "be_sequence.h" -#include "be_string.h" -#include "be_structure.h" -#include "be_typedef.h" -#include "be_union.h" -#include "be_union_branch.h" - #include "be_visitor_context.h" +#include "be_extern.h" be_visitor_context::be_visitor_context (void) : ast_visitor_context (), @@ -251,372 +230,6 @@ be_visitor_context::interface (void) const return this->interface_; } -// **************************************************************** - -be_argument * -be_visitor_context::be_node_as_argument (void) -{ - if (this->node_ != 0) - { - return be_argument::narrow_from_decl (this->node_); - } - else - { - return 0; - } -} - -be_array * -be_visitor_context::be_node_as_array (void) -{ - if (this->node_ != 0) - { - return be_array::narrow_from_decl (this->node_); - } - else - { - return 0; - } -} - -be_attribute * -be_visitor_context::be_node_as_attribute (void) -{ - if (this->node_ != 0) - { - return be_attribute::narrow_from_decl (this->node_); - } - else - { - return 0; - } -} - -be_constant * -be_visitor_context::be_node_as_constant (void) -{ - if (this->node_ != 0) - { - return be_constant::narrow_from_decl (this->node_); - } - else - { - return 0; - } -} - -be_enum * -be_visitor_context::be_node_as_enum (void) -{ - if (this->node_ != 0) - { - return be_enum::narrow_from_decl (this->node_); - } - else - { - return 0; - } -} - -be_enum_val * -be_visitor_context::be_node_as_enum_val (void) -{ - if (this->node_ != 0) - { - return be_enum_val::narrow_from_decl (this->node_); - } - else - { - return 0; - } -} - -be_exception * -be_visitor_context::be_node_as_exception (void) -{ - if (this->node_ != 0) - { - return be_exception::narrow_from_decl (this->node_); - } - else - { - return 0; - } -} - -be_field * -be_visitor_context::be_node_as_field (void) -{ - if (this->node_ != 0) - { - return be_field::narrow_from_decl (this->node_); - } - else - { - return 0; - } -} - -be_interface * -be_visitor_context::be_node_as_interface (void) -{ - if (this->node_ != 0) - { - return be_interface::narrow_from_decl (this->node_); - } - else - { - return 0; - } -} - -be_interface_fwd * -be_visitor_context::be_node_as_interface_fwd (void) -{ - if (this->node_ != 0) - { - return be_interface_fwd::narrow_from_decl (this->node_); - } - else - { - return 0; - } -} - -be_module * -be_visitor_context::be_node_as_module (void) -{ - if (this->node_ != 0) - { - return be_module::narrow_from_decl (this->node_); - } - else - { - return 0; - } -} - -be_operation * -be_visitor_context::be_node_as_operation (void) -{ - if (this->node_ != 0) - { - return be_operation::narrow_from_decl (this->node_); - } - else - { - return 0; - } -} - -be_predefined_type * -be_visitor_context::be_node_as_predefined_type (void) -{ - if (this->node_ != 0) - { - return be_predefined_type::narrow_from_decl (this->node_); - } - else - { - return 0; - } -} - -be_root * -be_visitor_context::be_node_as_root (void) -{ - if (this->node_ != 0) - { - return be_root::narrow_from_decl (this->node_); - } - else - { - return 0; - } -} - -be_sequence * -be_visitor_context::be_node_as_sequence (void) -{ - if (this->node_ != 0) - { - return be_sequence::narrow_from_decl (this->node_); - } - else - { - return 0; - } -} - -be_string * -be_visitor_context::be_node_as_string (void) -{ - if (this->node_ != 0) - { - return be_string::narrow_from_decl (this->node_); - } - else - { - return 0; - } -} - -be_structure * -be_visitor_context::be_node_as_structure (void) -{ - if (this->node_ != 0) - { - return be_structure::narrow_from_decl (this->node_); - } - else - { - return 0; - } -} - -be_typedef * -be_visitor_context::be_node_as_typedef (void) -{ - if (this->node_ != 0) - { - return be_typedef::narrow_from_decl (this->node_); - } - else - { - return 0; - } -} - -be_union * -be_visitor_context::be_node_as_union (void) -{ - if (this->node_ != 0) - { - return be_union::narrow_from_decl (this->node_); - } - else - { - return 0; - } -} - -be_union_branch * -be_visitor_context::be_node_as_union_branch (void) -{ - if (this->node_ != 0) - { - return be_union_branch::narrow_from_decl (this->node_); - } - else - { - return 0; - } -} - -be_enum * -be_visitor_context::be_scope_as_enum (void) -{ - if (this->scope_ != 0) - { - return be_enum::narrow_from_decl (this->scope_->decl ()); - } - else - { - return 0; - } -} - -be_exception * -be_visitor_context::be_scope_as_exception (void) -{ - if (this->scope_ != 0) - { - return be_exception::narrow_from_decl (this->scope_->decl ()); - } - else - { - return 0; - } -} - -be_interface * -be_visitor_context::be_scope_as_interface (void) -{ - if (this->scope_ != 0) - { - return be_interface::narrow_from_decl (this->scope_->decl ()); - } - else - { - return 0; - } -} - -be_module * -be_visitor_context::be_scope_as_module (void) -{ - if (this->scope_ != 0) - { - return be_module::narrow_from_decl (this->scope_->decl ()); - } - else - { - return 0; - } -} - -be_operation * -be_visitor_context::be_scope_as_operation (void) -{ - if (this->scope_ != 0) - { - return be_operation::narrow_from_decl (this->scope_->decl ()); - } - else - { - return 0; - } -} - -be_root * -be_visitor_context::be_scope_as_root (void) -{ - if (this->scope_ != 0) - { - return be_root::narrow_from_decl (this->scope_->decl ()); - } - else - { - return 0; - } -} - -be_structure * -be_visitor_context::be_scope_as_structure (void) -{ - if (this->scope_ != 0) - { - return be_structure::narrow_from_decl (this->scope_->decl ()); - } - else - { - return 0; - } -} - -be_union * -be_visitor_context::be_scope_as_union (void) -{ - if (this->scope_ != 0) - { - return be_union::narrow_from_decl (this->scope_->decl ()); - } - else - { - return 0; - } -} - const char * be_visitor_context::export_macro (void) const { diff --git a/TAO/TAO_IDL/be/be_visitor_decl.cpp b/TAO/TAO_IDL/be/be_visitor_decl.cpp index 379d71a67c8..f399cbdfe40 100644 --- a/TAO/TAO_IDL/be/be_visitor_decl.cpp +++ b/TAO/TAO_IDL/be/be_visitor_decl.cpp @@ -26,10 +26,6 @@ #include "be_type.h" #include "ace/Log_Msg.h" -ACE_RCSID (be, - be_visitor_decl, - "$Id$") - // Root visitor for client header be_visitor_decl::be_visitor_decl (be_visitor_context *ctx) : ctx_ (ctx) diff --git a/TAO/TAO_IDL/be/be_visitor_enum.cpp b/TAO/TAO_IDL/be/be_visitor_enum.cpp index be1a2adce3d..3b0dfcb5621 100644 --- a/TAO/TAO_IDL/be/be_visitor_enum.cpp +++ b/TAO/TAO_IDL/be/be_visitor_enum.cpp @@ -35,6 +35,3 @@ #include "be_visitor_enum/serializer_op_ch.cpp" #include "be_visitor_enum/serializer_op_cs.cpp" -ACE_RCSID (be, - be_visitor_enum, - "$Id$") diff --git a/TAO/TAO_IDL/be/be_visitor_enum/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_enum/any_op_ch.cpp index 4b815165473..edd589cbff5 100644 --- a/TAO/TAO_IDL/be/be_visitor_enum/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_enum/any_op_ch.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_enum, - any_op_ch, - "$Id$") - // *************************************************************************** // Enum visitor for generating Any operator declarations in the client header // *************************************************************************** diff --git a/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp index effcd2e15ce..e05e006a568 100644 --- a/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_enum, - any_op_cs, - "$Id$") - // *************************************************************************** // Enum visitor for generating Any operator declarations in the client // stubs file diff --git a/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_ch.cpp index 85f8cf0204c..9df52a0db59 100644 --- a/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_ch.cpp @@ -18,11 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_enum, - cdr_op_ch, - "$Id$") - - // *************************************************************************** // Enum visitor for generating Cdr operator declarations in the client header // *************************************************************************** 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 b1384d64794..8c9010c4aad 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 @@ -18,11 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_enum, - cdr_op_cs, - "$Id$") - - // *************************************************************************** // Enum visitor for generating CDR operator declarations in the client // stubs file. 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 583b177c659..903f4bb6d9e 100644 --- a/TAO/TAO_IDL/be/be_visitor_enum/enum_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_enum/enum_ch.cpp @@ -20,11 +20,6 @@ #include "be_visitor_typecode/typecode_decl.h" -ACE_RCSID (be_visitor_enum, - enum_ch, - "$Id$") - - // ******************************************************************** // Visitor implementation for the Enum type // This one for the client header file 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 452cfeb3a7a..4299fe9cca8 100644 --- a/TAO/TAO_IDL/be/be_visitor_enum/enum_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_enum/enum_cs.cpp @@ -20,11 +20,6 @@ #include "be_visitor_typecode/enum_typecode.h" -ACE_RCSID (be_visitor_enum, - enum_cs, - "$Id$") - - // ******************************************************************** // Visitor implementation for the Enum type // This one for the client stubs file diff --git a/TAO/TAO_IDL/be/be_visitor_enum/serializer_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_enum/serializer_op_ch.cpp index fa543f76d59..519978aac7a 100644 --- a/TAO/TAO_IDL/be/be_visitor_enum/serializer_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_enum/serializer_op_ch.cpp @@ -18,11 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_enum, - serializer_op_ch, - "$Id$") - - // *************************************************************************** // Enum visitor for generating Serializer operator declarations in the client header // *************************************************************************** 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 8ee3eab7b30..7a2316c4be8 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 @@ -19,11 +19,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_enum, - serializer_op_cs, - "$Id$") - - // *************************************************************************** // Enum visitor for generating Serializer operator declarations in the client // stubs file. diff --git a/TAO/TAO_IDL/be/be_visitor_exception.cpp b/TAO/TAO_IDL/be/be_visitor_exception.cpp index b1abf086343..7306889ba13 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception.cpp @@ -53,6 +53,3 @@ #include "be_visitor_exception/cdr_op_ch.cpp" #include "be_visitor_exception/cdr_op_cs.cpp" -ACE_RCSID (be, - be_visitor_exception, - "$Id$") diff --git a/TAO/TAO_IDL/be/be_visitor_exception/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_exception/any_op_ch.cpp index 3682ee0670d..3737fa58499 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/any_op_ch.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_exception, - any_op_ch, - "$Id$") - // *************************************************************************** // Exception visitor for generating Any operator declarations in the client header // *************************************************************************** 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 c1f5ced2ea5..a958bf1338d 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 @@ -14,10 +14,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_exception, - any_op_cs, - "$Id$") - // *************************************************************************** // Exception visitor for generating Any operator declarations in the client // stubs file diff --git a/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_ch.cpp index 3cb08db5470..78ee18bd524 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_ch.cpp @@ -19,10 +19,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_exception, - cdr_op_ch, - "$Id$") - // *************************************************************************** // Exception visitor for generating CDR operator declarations in the client header // *************************************************************************** diff --git a/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp index d04849fd46f..e1f53ec074b 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_exception, - cdr_op_cs, - "$Id$") - be_visitor_exception_cdr_op_cs::be_visitor_exception_cdr_op_cs ( be_visitor_context *ctx ) diff --git a/TAO/TAO_IDL/be/be_visitor_exception/ctor_assign.cpp b/TAO/TAO_IDL/be/be_visitor_exception/ctor_assign.cpp index ea3c3fbdda0..a29c10e1c95 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/ctor_assign.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/ctor_assign.cpp @@ -19,10 +19,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_exception, - ctor_assign, - "$Id$") - // ************************************************************************ // Used for the body of the assignment operator and the copy constructor. // ************************************************************************ diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception.cpp index b805b899cf1..e21fbe7dd72 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/exception.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/exception.cpp @@ -18,11 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_exception, - exception, - "$Id$") - - // Generic exception visitor. be_visitor_exception::be_visitor_exception (be_visitor_context *ctx) : be_visitor_scope (ctx) 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 f6b36894144..0b606e807aa 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp @@ -22,10 +22,6 @@ #include "global_extern.h" #include "utl_err.h" -ACE_RCSID (be_visitor_exception, - exception_ch, - "$Id$") - // ****************************************************** // For client header. // ****************************************************** 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 25edecd0bac..4379a988379 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/exception_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_ci.cpp @@ -18,11 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_exception, - exception_ci, - "$Id$") - - // ****************************************************** // for client inline // ****************************************************** 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 5af3eaedb71..f668e99b380 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp @@ -20,10 +20,6 @@ #include "be_visitor_typecode/typecode_defn.h" -ACE_RCSID (be_visitor_exception, - exception_cs, - "$Id$") - // *************************************************************************** // For client stubs. // *************************************************************************** diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception_ctor.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception_ctor.cpp index 6231586d0bd..52b8cbfbbc3 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/exception_ctor.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_ctor.cpp @@ -18,11 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_exception, - exception_ctor, - "$Id$") - - // ************************************************************************ // code to generate the special ctor // ************************************************************************ diff --git a/TAO/TAO_IDL/be/be_visitor_factory.cpp b/TAO/TAO_IDL/be/be_visitor_factory.cpp index 2a228ffe01d..46f27db466e 100644 --- a/TAO/TAO_IDL/be/be_visitor_factory.cpp +++ b/TAO/TAO_IDL/be/be_visitor_factory.cpp @@ -44,10 +44,6 @@ #include "be_visitor_operation/ami_handler_reply_stub_operation_cs.h" #include "be_visitor_operation/ami_exception_holder_operation_cs.h" -ACE_RCSID (be, - be_visitor_factory, - "$Id$") - TAO_Visitor_Factory::TAO_Visitor_Factory (void) { } diff --git a/TAO/TAO_IDL/be/be_visitor_field/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_field/cdr_op_ch.cpp index 1d1c82eaae9..822e46fe3e0 100644 --- a/TAO/TAO_IDL/be/be_visitor_field/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_field/cdr_op_ch.cpp @@ -26,11 +26,6 @@ #include "be_visitor_union/union.h" #include "be_visitor_union/cdr_op_ch.h" -ACE_RCSID (be_visitor_field, - cdr_op_ch, - "$Id$") - - // ********************************************** // Visitor for field in the client header file. // ********************************************** diff --git a/TAO/TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp index fd4f8c1060b..a656fb9fedd 100644 --- a/TAO/TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp @@ -91,7 +91,8 @@ be_visitor_field_cdr_op_cs::visit_array (be_array *node) // field. TAO_OutStream *os = this->ctx_->stream (); - be_field *f = this->ctx_->be_node_as_field (); + be_field *f = + be_field::narrow_from_decl (this->ctx_->node ()); if (f == 0) { @@ -197,7 +198,8 @@ be_visitor_field_cdr_op_cs::visit_enum (be_enum *node) TAO_OutStream *os = this->ctx_->stream (); // Retrieve the field node. - be_field *f = this->ctx_->be_node_as_field (); + be_field *f = + be_field::narrow_from_decl (this->ctx_->node ()); if (f == 0) { @@ -239,9 +241,10 @@ int be_visitor_field_cdr_op_cs::visit_interface (be_interface *node) { TAO_OutStream *os = this->ctx_->stream (); - be_field *f = this->ctx_->be_node_as_field (); + be_field *f = + be_field::narrow_from_decl (this->ctx_->node ()); - if (!f) + if (f == 0) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_field_cdr_op_cs::" @@ -312,7 +315,8 @@ be_visitor_field_cdr_op_cs::visit_interface_fwd (be_interface_fwd *node) TAO_OutStream *os = this->ctx_->stream (); // Retrieve the field node. - be_field *f = this->ctx_->be_node_as_field (); + be_field *f = + be_field::narrow_from_decl (this->ctx_->node ()); if (f == 0) { @@ -414,9 +418,10 @@ int be_visitor_field_cdr_op_cs::emit_valuetype_common (void) { TAO_OutStream *os = this->ctx_->stream (); - be_field *f = this->ctx_->be_node_as_field (); + be_field *f = + be_field::narrow_from_decl (this->ctx_->node ()); - if (!f) + if (f == 0) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_field_cdr_op_cs::" @@ -461,7 +466,8 @@ be_visitor_field_cdr_op_cs::visit_predefined_type (be_predefined_type *node) TAO_OutStream *os = this->ctx_->stream (); // Retrieve the field node. - be_field *f = this->ctx_->be_node_as_field (); + be_field *f = + be_field::narrow_from_decl (this->ctx_->node ()); if (f == 0) { @@ -583,7 +589,8 @@ be_visitor_field_cdr_op_cs::visit_sequence (be_sequence *node) TAO_OutStream *os = this->ctx_->stream (); // Retrieve the field node. - be_field *f = this->ctx_->be_node_as_field (); + be_field *f = + be_field::narrow_from_decl (this->ctx_->node ()); if (f == 0) { @@ -627,7 +634,8 @@ be_visitor_field_cdr_op_cs::visit_string (be_string *str) TAO_OutStream *os = this->ctx_->stream (); // Retrieve the field node. - be_field *f = this->ctx_->be_node_as_field (); + be_field *f = + be_field::narrow_from_decl (this->ctx_->node ()); if (f == 0) { @@ -728,7 +736,8 @@ be_visitor_field_cdr_op_cs::visit_structure (be_structure *node) TAO_OutStream *os = this->ctx_->stream (); // retrieve the field node. - be_field *f = this->ctx_->be_node_as_field (); + be_field *f = + be_field::narrow_from_decl (this->ctx_->node ()); if (f == 0) { @@ -812,7 +821,8 @@ be_visitor_field_cdr_op_cs::visit_union (be_union *node) TAO_OutStream *os = this->ctx_->stream (); // Retrieve the field node. - be_field *f = this->ctx_->be_node_as_field (); + be_field *f = + be_field::narrow_from_decl (this->ctx_->node ()); if (f == 0) { @@ -901,7 +911,8 @@ be_visitor_cdr_op_field_decl::visit_array (be_array *node) TAO_OutStream *os = this->ctx_->stream (); // Retrieve the field node. - be_field *f = this->ctx_->be_node_as_field (); + be_field *f = + be_field::narrow_from_decl (this->ctx_->node ()); if (f == 0) { diff --git a/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp b/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp index 77bee361ff1..a73abe79333 100644 --- a/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp @@ -22,10 +22,6 @@ #include "be_visitor_sequence/sequence_ch.h" #include "nr_extern.h" -ACE_RCSID (be_visitor_field, - field_ch, - "$Id$") - // ********************************************** // Visitor for field in the client header file. // ********************************************** diff --git a/TAO/TAO_IDL/be/be_visitor_field/field_ci.cpp b/TAO/TAO_IDL/be/be_visitor_field/field_ci.cpp index c50b84902db..9218cf0e3bc 100644 --- a/TAO/TAO_IDL/be/be_visitor_field/field_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_field/field_ci.cpp @@ -22,11 +22,6 @@ #include "be_visitor_structure/structure_ci.h" #include "be_visitor_union/union_ci.h" -ACE_RCSID (be_visitor_field, - field_ci, - "$Id$") - - be_visitor_field_ci::be_visitor_field_ci (be_visitor_context *ctx) : be_visitor_decl (ctx) { diff --git a/TAO/TAO_IDL/be/be_visitor_field/field_cs.cpp b/TAO/TAO_IDL/be/be_visitor_field/field_cs.cpp index 435125f9d70..7adee5b881f 100644 --- a/TAO/TAO_IDL/be/be_visitor_field/field_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_field/field_cs.cpp @@ -24,11 +24,6 @@ #include "be_visitor_structure/structure_cs.h" #include "be_visitor_union/union_cs.h" -ACE_RCSID (be_visitor_field, - field_cs, - "$Id$") - - // ********************************************** // Visitor for field in the client stubs file. // ********************************************** diff --git a/TAO/TAO_IDL/be/be_visitor_field/serializer_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_field/serializer_op_ch.cpp index e3c829f59e2..1087c70d965 100644 --- a/TAO/TAO_IDL/be/be_visitor_field/serializer_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_field/serializer_op_ch.cpp @@ -27,11 +27,6 @@ #include "be_visitor_union/union.h" #include "be_visitor_union/serializer_op_ch.h" -ACE_RCSID (be_visitor_field, - serializer_op_ch, - "$Id$") - - // ********************************************** // Visitor for field in the client header file. // ********************************************** diff --git a/TAO/TAO_IDL/be/be_visitor_field/serializer_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_field/serializer_op_cs.cpp index 05696512e36..c4748b834aa 100644 --- a/TAO/TAO_IDL/be/be_visitor_field/serializer_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_field/serializer_op_cs.cpp @@ -92,7 +92,8 @@ be_visitor_field_serializer_op_cs::visit_array (be_array *node) // field. TAO_OutStream *os = this->ctx_->stream (); - be_field *f = this->ctx_->be_node_as_field (); + be_field *f = + be_field::narrow_from_decl (this->ctx_->node ()); if (f == 0) { @@ -212,7 +213,8 @@ be_visitor_field_serializer_op_cs::visit_enum (be_enum *node) TAO_OutStream *os = this->ctx_->stream (); // Retrieve the field node. - be_field *f = this->ctx_->be_node_as_field (); + be_field *f = + be_field::narrow_from_decl (this->ctx_->node ()); if (f == 0) { @@ -262,9 +264,10 @@ int be_visitor_field_serializer_op_cs::visit_interface (be_interface *node) { TAO_OutStream *os = this->ctx_->stream (); - be_field *f = this->ctx_->be_node_as_field (); + be_field *f = + be_field::narrow_from_decl (this->ctx_->node ()); - if (!f) + if (f == 0) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_field_serializer_op_cs::" @@ -335,7 +338,8 @@ be_visitor_field_serializer_op_cs::visit_interface_fwd (be_interface_fwd *node) TAO_OutStream *os = this->ctx_->stream (); // Retrieve the field node. - be_field *f = this->ctx_->be_node_as_field (); + be_field *f = + be_field::narrow_from_decl (this->ctx_->node ()); if (f == 0) { @@ -413,9 +417,10 @@ int be_visitor_field_serializer_op_cs::visit_valuetype (be_valuetype *) { TAO_OutStream *os = this->ctx_->stream (); - be_field *f = this->ctx_->be_node_as_field (); + be_field *f = + be_field::narrow_from_decl (this->ctx_->node ()); - if (!f) + if (f == 0) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_field_serializer_op_cs::" @@ -464,7 +469,8 @@ be_visitor_field_serializer_op_cs::visit_valuetype_fwd (be_valuetype_fwd *) TAO_OutStream *os = this->ctx_->stream (); // Retrieve the field node. - be_field *f = this->ctx_->be_node_as_field (); + be_field *f = + be_field::narrow_from_decl (this->ctx_->node ()); if (f == 0) { @@ -511,12 +517,14 @@ be_visitor_field_serializer_op_cs::visit_eventtype_fwd (be_eventtype_fwd *node) // Visit predefined type. int -be_visitor_field_serializer_op_cs::visit_predefined_type (be_predefined_type *node) +be_visitor_field_serializer_op_cs::visit_predefined_type ( + be_predefined_type *node) { TAO_OutStream *os = this->ctx_->stream (); // Retrieve the field node. - be_field *f = this->ctx_->be_node_as_field (); + be_field *f = + be_field::narrow_from_decl (this->ctx_->node ()); if (f == 0) { @@ -691,7 +699,8 @@ be_visitor_field_serializer_op_cs::visit_sequence (be_sequence *node) TAO_OutStream *os = this->ctx_->stream (); // Retrieve the field node. - be_field *f = this->ctx_->be_node_as_field (); + be_field *f = + be_field::narrow_from_decl (this->ctx_->node ()); if (f == 0) { @@ -747,7 +756,8 @@ be_visitor_field_serializer_op_cs::visit_string (be_string *node) TAO_OutStream *os = this->ctx_->stream (); // Retrieve the field node. - be_field *f = this->ctx_->be_node_as_field (); + be_field *f = + be_field::narrow_from_decl (this->ctx_->node ()); if (f == 0) { @@ -838,8 +848,9 @@ be_visitor_field_serializer_op_cs::visit_structure (be_structure *node) TAO_OutStream *os = this->ctx_->stream (); - // retrieve the field node. - be_field *f = this->ctx_->be_node_as_field (); + // Retrieve the field node. + be_field *f = + be_field::narrow_from_decl (this->ctx_->node ()); if (f == 0) { @@ -935,7 +946,8 @@ be_visitor_field_serializer_op_cs::visit_union (be_union *node) TAO_OutStream *os = this->ctx_->stream (); // Retrieve the field node. - be_field *f = this->ctx_->be_node_as_field (); + be_field *f = + be_field::narrow_from_decl (this->ctx_->node ()); if (f == 0) { @@ -1036,7 +1048,8 @@ be_visitor_serializer_op_field_decl::visit_array (be_array *node) TAO_OutStream *os = this->ctx_->stream (); // Retrieve the field node. - be_field *f = this->ctx_->be_node_as_field (); + be_field *f = + be_field::narrow_from_decl (this->ctx_->node ()); if (f == 0) { diff --git a/TAO/TAO_IDL/be/be_visitor_home.cpp b/TAO/TAO_IDL/be/be_visitor_home.cpp index cd527f54e06..f0519280945 100644 --- a/TAO/TAO_IDL/be/be_visitor_home.cpp +++ b/TAO/TAO_IDL/be/be_visitor_home.cpp @@ -33,6 +33,8 @@ #include "be_attribute.h" #include "be_home.h" #include "be_component.h" +#include "be_factory.h" +#include "be_finder.h" #include "be_operation.h" #include "be_sequence.h" #include "be_string.h" @@ -42,6 +44,7 @@ #include "be_visitor_operation.h" #include "be_visitor_typecode/typecode_defn.h" #include "be_visitor_typecode/objref_typecode.h" +#include "be_visitor_valuetype/valuetype_init_arglist_ch.h" #include "be_visitor_context.h" #include "be_visitor_home/home_ch.cpp" @@ -52,7 +55,3 @@ #include "be_visitor_home/home_exh.cpp" #include "be_visitor_home/home_exs.cpp" -ACE_RCSID (be, - be_visitor_home, - "$Id$") - 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 69fbfd2e92d..2680b90e54f 100644 --- a/TAO/TAO_IDL/be/be_visitor_home/home_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_home/home_ch.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_home, - home_ch, - "$Id$") - be_visitor_home_ch::be_visitor_home_ch ( be_visitor_context *ctx ) 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 d57f034cc09..57073df7cf4 100644 --- a/TAO/TAO_IDL/be/be_visitor_home/home_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_home/home_cs.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_home, - home_cs, - "$Id$") - be_visitor_home_cs::be_visitor_home_cs ( be_visitor_context *ctx ) diff --git a/TAO/TAO_IDL/be/be_visitor_home/home_ex_idl.cpp b/TAO/TAO_IDL/be/be_visitor_home/home_ex_idl.cpp index 51d1c7f9dc4..11a78557e3a 100644 --- a/TAO/TAO_IDL/be/be_visitor_home/home_ex_idl.cpp +++ b/TAO/TAO_IDL/be/be_visitor_home/home_ex_idl.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_home, - home_ex_idl, - "$Id$") - // ****************************************************** // Home visitor for CIAO executor IDL // ****************************************************** @@ -162,6 +158,32 @@ be_visitor_home_ex_idl::visit_argument (be_argument *node) } int +be_visitor_home_ex_idl::visit_factory (be_factory *node) +{ + os_ << be_nl + << "::Components::EnterpriseComponent " + << IdentifierHelper::try_escape (node->original_local_name ()).c_str () + << " (" << be_idt << be_idt; + + if (this->visit_scope (node) == -1) + { + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("be_visitor_home_ex_idl::") + ACE_TEXT ("visit_factory - ") + ACE_TEXT ("codegen for scope failed\n"))); + } + + os_ << ")" + << be_uidt << be_uidt; + + this->gen_exception_list (node->exceptions (), "", true); + + os_ << ";"; + + return 0; +} + +int be_visitor_home_ex_idl::visit_sequence (be_sequence *node) { // Keep output statements separate because of side effects. @@ -318,9 +340,6 @@ be_visitor_home_ex_idl::gen_explicit (void) ACE_TEXT ("visit_scope() failed\n"))); } - this->gen_factories (); - this->gen_finders (); - os_ << be_uidt_nl << "};"; } @@ -407,52 +426,6 @@ be_visitor_home_ex_idl::gen_exception_list ( } void -be_visitor_home_ex_idl::gen_factories (void) -{ - this->gen_init_ops (node_->factories ()); -} - -void -be_visitor_home_ex_idl::gen_finders (void) -{ - this->gen_init_ops (node_->finders ()); -} - -void -be_visitor_home_ex_idl::gen_init_ops (AST_Home::INIT_LIST & list) -{ - AST_Operation **op = 0; - - for (AST_Home::INIT_LIST::ITERATOR i = list.begin (); - !i.done (); - i.advance ()) - { - i.next (op); - be_operation *bop = be_operation::narrow_from_decl (*op); - - os_ << be_nl - << "::Components::EnterpriseComponent " - << IdentifierHelper::try_escape (bop->original_local_name ()).c_str () - << " (" << be_idt << be_idt; - - if (this->visit_scope (bop) == -1) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("be_visitor_home_ex_idl::") - ACE_TEXT ("gen_init_ops - ") - ACE_TEXT ("visit_scope() failed\n"))); - } - - os_ << ")" - << be_uidt << be_uidt; - - this->gen_exception_list (bop->exceptions (), "", true); - - os_ << ";"; - } -} - -void be_visitor_home_ex_idl::gen_home_executor (void) { AST_Component *comp = node_->managed_component (); diff --git a/TAO/TAO_IDL/be/be_visitor_home/home_exh.cpp b/TAO/TAO_IDL/be/be_visitor_home/home_exh.cpp index b9bc66cac48..c31a1546633 100644 --- a/TAO/TAO_IDL/be/be_visitor_home/home_exh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_home/home_exh.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_home, - home_exh, - "$Id$") - // ****************************************************** // Home visitor for exec impl header // ****************************************************** @@ -88,6 +84,31 @@ be_visitor_home_exh::visit_attribute (be_attribute *node) } int +be_visitor_home_exh::visit_factory (be_factory *node) +{ + os_ << be_nl << be_nl + << "virtual ::Components::EnterpriseComponent_ptr" << be_nl + << node->local_name (); + + // We can reuse this visitor. + be_visitor_valuetype_init_arglist_ch v (this->ctx_); + + if (v.visit_factory (node) != 0) + { + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("be_visitor_home_exh::") + ACE_TEXT ("visit_factory - ") + ACE_TEXT ("codegen for argument ") + ACE_TEXT ("list failed\n")), + -1); + } + + os_ << ";"; + + return 0; +} + +int be_visitor_home_exh::gen_exec_class (void) { // We don't want a '_cxx_' prefix here. @@ -109,12 +130,46 @@ be_visitor_home_exh::gen_exec_class (void) os_ << be_nl << be_nl << "virtual ~" << lname << "_exec_i (void);"; - this->gen_ops_attrs (); - - this->gen_factories (); - - this->gen_finders (); + be_home *h = node_; + while (h != 0) + { + if (this->visit_scope (h) != 0) + { + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("be_visitor_home_exh::") + ACE_TEXT ("gen_exec_class - ") + ACE_TEXT ("visit_scope() failed\n")), + -1); + } + + for (long i = 0; i < h->n_inherits (); ++i) + { + // A closure of all the supported interfaces is stored + // in the base class 'pd_inherits_flat' member. + be_interface *bi = + be_interface::narrow_from_decl (h->inherits ()[i]); + + int status = + bi->traverse_inheritance_graph ( + be_visitor_home_exh::op_attr_decl_helper, + &os_); + + if (status == -1) + { + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("be_visitor_home_exh::") + ACE_TEXT ("gen_exec_class - ") + ACE_TEXT ("traverse_inheritance_graph() ") + ACE_TEXT ("failed on %s\n"), + bi->full_name ()), + -1); + } + } + + h = be_home::narrow_from_decl (h->base_home ()); + } + os_ << be_nl << be_nl << "// Implicit operations."; @@ -128,129 +183,6 @@ be_visitor_home_exh::gen_exec_class (void) return 0; } -int -be_visitor_home_exh::gen_ops_attrs (void) -{ - os_ << be_nl << be_nl - << "// All operations and attributes."; - - int status = - node_->traverse_inheritance_graph ( - be_visitor_home_exh::op_attr_decl_helper, - &os_); - - if (status == -1) - { - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("be_visitor_home_exh::") - ACE_TEXT ("gen_ops_attrs - ") - ACE_TEXT ("traverse_inheritance_graph() ") - ACE_TEXT ("failed\n")), - -1); - } - - return 0; -} - -int -be_visitor_home_exh::gen_factories (void) -{ - os_ << be_nl << be_nl - << "// Factory operations."; - - return this->gen_factories_r (node_); -} - -int -be_visitor_home_exh::gen_factories_r (AST_Home *node) -{ - if (node == 0) - { - return 0; - } - - if (this->gen_init_ops_i (node->factories ()) == -1) - { - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("be_visitor_home_exh::") - ACE_TEXT ("gen_factories_r - ") - ACE_TEXT ("gen_init_ops_i() failed\n")), - -1); - } - - AST_Home *base = node->base_home (); - - return this->gen_factories_r (base); -} - -int -be_visitor_home_exh::gen_finders (void) -{ - os_ << be_nl << be_nl - << "// Finder operations."; - - return this->gen_finders_r (node_); -} - -int -be_visitor_home_exh::gen_finders_r (AST_Home *node) -{ - if (node == 0) - { - return 0; - } - - if (this->gen_init_ops_i (node->finders ()) == -1) - { - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("be_visitor_home_exh::") - ACE_TEXT ("gen_finders_r - ") - ACE_TEXT ("gen_init_ops_i() failed\n")), - -1); - } - - AST_Home *base = node->base_home (); - - return this->gen_finders_r (base); -} - -int -be_visitor_home_exh::gen_init_ops_i (AST_Home::INIT_LIST & list) -{ - AST_Operation **op = 0; - - for (AST_Home::INIT_LIST::ITERATOR i = list.begin (); - !i.done (); - i.advance ()) - { - i.next (op); - be_operation *bop = be_operation::narrow_from_decl (*op); - - /// Return type for home exec factories and finders is not - /// the same as for the corresponding home servant, so we - /// generate the return type and op name by hand, then finish - /// the operation traversal with an arglist visitor. - os_ << be_nl << be_nl - << "::Components::EnterpriseComponent_ptr" << be_nl - << bop->local_name (); - - be_visitor_operation_arglist visitor (this->ctx_); - - if (visitor.visit_operation (bop) == -1) - { - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("be_visitor_home_exh::") - ACE_TEXT ("gen_init_ops_i - ") - ACE_TEXT ("visit_operation() failed\n")), - -1); - } - - os_ << ";"; - } - - return 0; -} - void be_visitor_home_exh::gen_entrypoint (void) { @@ -277,5 +209,3 @@ be_visitor_home_exh::op_attr_decl_helper (be_interface * /* derived */, /// visit_attribute(), we can get away with this for the declarations. return visitor.visit_scope (ancestor); } - - diff --git a/TAO/TAO_IDL/be/be_visitor_home/home_exs.cpp b/TAO/TAO_IDL/be/be_visitor_home/home_exs.cpp index f3000e78f7c..28befbbacfb 100644 --- a/TAO/TAO_IDL/be/be_visitor_home/home_exs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_home/home_exs.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_home, - home_exs, - "$Id$") - // ****************************************************** // Home visitor for exec impl source // ****************************************************** @@ -93,6 +89,42 @@ be_visitor_home_exs::visit_attribute (be_attribute *node) } int +be_visitor_home_exs::visit_factory (be_factory *node) +{ + AST_Decl *scope = ScopeAsDecl (comp_->defined_in ()); + ACE_CString sname_str (scope->full_name ()); + const char *sname = sname_str.c_str (); + const char *lname = comp_->local_name ()->get_string (); + const char *global = (sname_str == "" ? "" : "::"); + + os_ << be_nl << be_nl + << "::Components::EnterpriseComponent_ptr" << be_nl + << node_->original_local_name ()->get_string () + << "_exec_i::" << node->local_name (); + + be_visitor_operation_arglist visitor (this->ctx_); + visitor.unused (true); + + if (visitor.visit_factory (node) == -1) + { + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("be_visitor_home_exs::") + ACE_TEXT ("visit_factory - ") + ACE_TEXT ("codegen for arglist failed\n")), + -1); + } + + os_ << be_nl + << "{" << be_idt_nl + << your_code_here_ << be_nl + << "return " << global << sname << "::CCM_" + << lname << "::_nil ();" << be_uidt_nl + << "}"; + + return 0; +} + +int be_visitor_home_exs::gen_exec_class (void) { // No '_cxx_' prefix. @@ -114,12 +146,54 @@ be_visitor_home_exs::gen_exec_class (void) << lname << "_exec_i::~" << lname << "_exec_i (void)" << be_nl << "{" << be_nl << "}"; - - this->gen_ops_attrs (); - - this->gen_factories (); - - this->gen_finders (); + + be_home *h = node_; + + while (h != 0) + { + if (this->visit_scope (h) != 0) + { + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("be_visitor_home_exs::") + ACE_TEXT ("gen_exec_class - ") + ACE_TEXT ("codegen for scope ") + ACE_TEXT ("failed\n")), + -1); + } + + for (long i = 0; i < h->n_inherits (); ++i) + { + // A closure of all the supported interfaces is stored + // in the base class 'pd_inherits_flat' member. + be_interface *bi = + be_interface::narrow_from_decl (h->inherits ()[i]); + + bi->get_insert_queue ().reset (); + bi->get_del_queue ().reset (); + bi->get_insert_queue ().enqueue_tail (bi); + + Home_Exec_Op_Attr_Generator op_attr_gen (this); + + int status = + bi->traverse_inheritance_graph (op_attr_gen, + &os_, + false, + false); + + if (status == -1) + { + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("be_visitor_home_exs::") + ACE_TEXT ("gen_exec_class - ") + ACE_TEXT ("traverse_inheritance_graph() ") + ACE_TEXT ("failed for %s\n"), + bi->full_name ()), + -1); + } + } + + h = be_home::narrow_from_decl (h->base_home ()); + } os_ << be_nl << be_nl << "// Implicit operations."; @@ -144,150 +218,6 @@ be_visitor_home_exs::gen_exec_class (void) return 0; } -int -be_visitor_home_exs::gen_ops_attrs (void) -{ - os_ << be_nl << be_nl - << "// All operations and attributes."; - - node_->get_insert_queue ().reset (); - node_->get_del_queue ().reset (); - node_->get_insert_queue ().enqueue_tail (node_); - - Home_Exec_Op_Attr_Generator op_attr_gen (this); - - int status = - node_->traverse_inheritance_graph (op_attr_gen, - &os_, - false, - false); - - if (status == -1) - { - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("be_visitor_home_exs::") - ACE_TEXT ("gen_ops_attrs - ") - ACE_TEXT ("traverse_inheritance_graph() ") - ACE_TEXT ("failed\n")), - -1); - } - - return 0; -} - -int -be_visitor_home_exs::gen_factories (void) -{ - os_ << be_nl << be_nl - << "// Factory operations."; - - return this->gen_factories_r (node_); -} - -int -be_visitor_home_exs::gen_factories_r (AST_Home *node) -{ - if (node == 0) - { - return 0; - } - - if (this->gen_init_ops_i (node->factories ()) == -1) - { - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("be_visitor_home_exs::") - ACE_TEXT ("gen_factories_r - ") - ACE_TEXT ("gen_init_ops_i() failed\n")), - -1); - } - - AST_Home *base = node->base_home (); - - return this->gen_factories_r (base); -} - -int -be_visitor_home_exs::gen_finders (void) -{ - os_ << be_nl << be_nl - << "// Finder operations."; - - return this->gen_finders_r (node_); -} - -int -be_visitor_home_exs::gen_finders_r (AST_Home *node) -{ - if (node == 0) - { - return 0; - } - - if (this->gen_init_ops_i (node->finders ()) == -1) - { - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("be_visitor_home_exs::") - ACE_TEXT ("gen_finders_r - ") - ACE_TEXT ("gen_init_ops_i() failed\n")), - -1); - } - - AST_Home *base = node->base_home (); - - return this->gen_finders_r (base); -} - -int -be_visitor_home_exs::gen_init_ops_i (AST_Home::INIT_LIST & list) -{ - AST_Decl *scope = ScopeAsDecl (comp_->defined_in ()); - ACE_CString sname_str (scope->full_name ()); - const char *sname = sname_str.c_str (); - const char *lname = comp_->local_name ()->get_string (); - const char *global = (sname_str == "" ? "" : "::"); - - AST_Operation **op = 0; - - for (AST_Home::INIT_LIST::ITERATOR i = list.begin (); - !i.done (); - i.advance ()) - { - i.next (op); - be_operation *bop = be_operation::narrow_from_decl (*op); - - /// Return type for home exec factories and finders is not - /// the same as for the corresponding home servant, so we - /// generate the return type and op name by hand, then finish - /// the operation traversal with an arglist visitor. - os_ << be_nl << be_nl - << "::Components::EnterpriseComponent_ptr" << be_nl - << node_->original_local_name ()->get_string () - << "_exec_i::" - << bop->local_name (); - - be_visitor_operation_arglist visitor (this->ctx_); - visitor.unused (true); - - if (visitor.visit_operation (bop) == -1) - { - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("be_visitor_home_exs::") - ACE_TEXT ("gen_init_ops_i - ") - ACE_TEXT ("visit_operation() failed\n")), - -1); - } - - os_ << be_nl - << "{" << be_idt_nl - << your_code_here_ << be_nl - << "return " << global << sname << "::CCM_" - << lname << "::_nil ();" << be_uidt_nl - << "}"; - } - - return 0; -} - void be_visitor_home_exs::gen_entrypoint (void) { @@ -322,4 +252,3 @@ Home_Exec_Op_Attr_Generator::emit (be_interface * /* derived_interface */, return visitor_->visit_scope (base_interface); } - diff --git a/TAO/TAO_IDL/be/be_visitor_home/home_svh.cpp b/TAO/TAO_IDL/be/be_visitor_home/home_svh.cpp index 4df0dab9b12..c6c3118fb0b 100644 --- a/TAO/TAO_IDL/be/be_visitor_home/home_svh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_home/home_svh.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_home, - home_svh, - "$Id$") - // ****************************************************** // Home visitor for server header // ****************************************************** @@ -96,6 +92,37 @@ be_visitor_home_svh::visit_attribute (be_attribute *node) } int +be_visitor_home_svh::visit_factory (be_factory *node) +{ + os_ << be_nl << be_nl + << "virtual ::" << comp_->name () << "_ptr" << be_nl + << node->local_name (); + + // We can reuse this visitor. + be_visitor_valuetype_init_arglist_ch v (this->ctx_); + + if (v.visit_factory (node) != 0) + { + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("be_visitor_home_svh::") + ACE_TEXT ("visit_factory - ") + ACE_TEXT ("codegen for argument ") + ACE_TEXT ("list failed\n")), + -1); + } + + os_ << ";"; + + return 0; +} + +int +be_visitor_home_svh::visit_finder (be_finder *node) +{ + return this->visit_factory (node); +} + +int be_visitor_home_svh::gen_servant_class (void) { AST_Decl *scope = ScopeAsDecl (node_->defined_in ()); @@ -132,126 +159,77 @@ be_visitor_home_svh::gen_servant_class (void) os_ << be_nl << be_nl << "virtual ~" << lname << "_Servant (void);"; - this->gen_ops_attrs (); - - this->gen_factories (); - - this->gen_finders (); - - os_ << be_uidt_nl - << "};"; - - return 0; -} - -int -be_visitor_home_svh::gen_ops_attrs (void) -{ - os_ << be_nl << be_nl - << "// All operations and attributes."; - - int status = - node_->traverse_inheritance_graph ( - be_visitor_home_svh::op_attr_decl_helper, - &os_); - - if (status == -1) - { - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("be_visitor_home_svh::") - ACE_TEXT ("gen_ops_attrs - ") - ACE_TEXT ("traverse_inheritance_graph() ") - ACE_TEXT ("failed\n")), - -1); - } - - return 0; -} - -int -be_visitor_home_svh::gen_factories (void) -{ - os_ << be_nl << be_nl - << "// Factory operations."; + AST_Type *pk = node_->primary_key (); - return this->gen_factories_r (node_); -} - -int -be_visitor_home_svh::gen_factories_r (AST_Home *node) -{ - if (node == 0) - { - return 0; - } - - if (this->gen_init_ops_i (node->factories ()) == -1) + if (pk != 0) { - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("be_visitor_home_svh::") - ACE_TEXT ("gen_factories_r - ") - ACE_TEXT ("gen_init_ops_i() failed\n")), - -1); + os_ << be_nl << be_nl + << "// Implicit home primary key operations - not supported."; + + os_ << be_nl << be_nl + << "virtual ::" << comp_->name () << "_ptr" << be_nl + << "create (" << be_idt_nl + << "::" << pk->name () << " * key);" << be_uidt; + + os_ << be_nl << be_nl + << "virtual ::" << comp_->name () << "_ptr" << be_nl + << "find_by_primary_key (" << be_idt_nl + << "::" << pk->name () << " * key);" << be_uidt; + + os_ << be_nl << be_nl + << "virtual void" << be_nl + << "remove (" << be_idt_nl + << "::" << pk->name () << " * key);" << be_uidt; + + os_ << be_nl << be_nl + << "virtual ::" << pk->name () << " *" << be_nl + << "get_primary_key (" << be_idt_nl + << "::" << comp_->name () << "_ptr comp);" << be_uidt; } - AST_Home *base = node->base_home (); + be_home *h = node_; - return this->gen_factories_r (base); -} - -int -be_visitor_home_svh::gen_finders (void) -{ - os_ << be_nl << be_nl - << "// Finder operations."; - - return this->gen_finders_r (node_); -} - -int -be_visitor_home_svh::gen_finders_r (AST_Home *node) -{ - if (node == 0) + while (h != 0) { - return 0; - } - - if (this->gen_init_ops_i (node->finders ()) == -1) - { - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("be_visitor_home_svh::") - ACE_TEXT ("gen_finders_r - ") - ACE_TEXT ("gen_init_ops_i() failed\n")), - -1); - } - - AST_Home *base = node->base_home (); - - return this->gen_finders_r (base); -} - -int -be_visitor_home_svh::gen_init_ops_i (AST_Home::INIT_LIST & list) -{ - AST_Operation **op = 0; - - for (AST_Home::INIT_LIST::ITERATOR i = list.begin (); - !i.done (); - i.advance ()) - { - i.next (op); - be_operation *bop = be_operation::narrow_from_decl (*op); - - if (this->visit_operation (bop) == -1) + if (this->visit_scope (h) != 0) { ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("be_visitor_home_svh::") - ACE_TEXT ("gen_init_ops_i - ") - ACE_TEXT ("visit_operation() failed\n")), + ACE_TEXT ("gen_servant_class - ") + ACE_TEXT ("visit_scope() failed\n")), -1); } + + for (long i = 0; i < h->n_inherits (); ++i) + { + // A closure of all the supported interfaces is stored + // in the base class 'pd_inherits_flat' member. + be_interface *bi = + be_interface::narrow_from_decl (h->inherits ()[i]); + + int status = + bi->traverse_inheritance_graph ( + be_visitor_home_svh::op_attr_decl_helper, + &os_); + + if (status == -1) + { + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("be_visitor_home_svh::") + ACE_TEXT ("gen_servant_class - ") + ACE_TEXT ("traverse_inheritance_graph() ") + ACE_TEXT ("failed for %s\n"), + bi->full_name ()), + -1); + } + } + + h = be_home::narrow_from_decl (h->base_home ()); } - + + os_ << be_uidt_nl + << "};"; + return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_home/home_svs.cpp b/TAO/TAO_IDL/be/be_visitor_home/home_svs.cpp index 47109d0584e..43c1ffc95bc 100644 --- a/TAO/TAO_IDL/be/be_visitor_home/home_svs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_home/home_svs.cpp @@ -5,7 +5,7 @@ // ============================================================================ // // = LIBRARY -// TAO IDL +// TAO_IDL_BE // // = FILENAME // home_svs.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_home, - home_svs, - "$Id$") - // ****************************************************** // Home visitor for server source // ****************************************************** @@ -32,7 +28,8 @@ be_visitor_home_svs::be_visitor_home_svs (be_visitor_context *ctx) comp_ (0), os_ (*ctx->stream ()), export_macro_ (be_global->svnt_export_macro ()), - swapping_ (be_global->gen_component_swapping ()) + swapping_ (be_global->gen_component_swapping ()), + for_finder_ (false) { /// All existing CIAO examples set the servant export values in the CIDL /// compiler to equal the IDL compiler's skel export values. Below is a @@ -112,6 +109,88 @@ be_visitor_home_svs::visit_argument (be_argument *node) } int +be_visitor_home_svs::visit_factory (be_factory *node) +{ + os_ << be_nl << be_nl + << "::" << comp_->name () << "_ptr" << be_nl + << node_->original_local_name ()->get_string () + << "_Servant::" << node->local_name (); + + be_visitor_operation_arglist al_visitor (this->ctx_); + al_visitor.unused (this->for_finder_); + + if (al_visitor.visit_factory (node) == -1) + { + ACE_ERROR_RETURN ((LM_ERROR, + "be_visitor_factory_svs::" + "visit_factory - " + "codegen for argument list failed\n"), + -1); + } + + os_ << be_nl + << "{" << be_idt_nl; + + if (this->for_finder_) + { + os_ << "throw ::CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8," + << be_nl + << " CORBA::COMPLETED_NO);"; + } + else + { + ACE_CString comp_sname_str ( + ScopeAsDecl (comp_->defined_in ())->full_name ()); + const char *comp_sname = comp_sname_str.c_str (); + const char *comp_lname = comp_->local_name ()->get_string (); + const char *global = (comp_sname_str == "" ? "" : "::"); + + os_ << "::Components::EnterpriseComponent_var _ciao_ec =" + << be_idt_nl + << "this->executor_->" << node->local_name () << " ("; + + if (node->argument_count () > 0) + { + os_ << be_idt_nl; + + if (this->visit_scope (node) != 0) + { + ACE_ERROR_RETURN ((LM_ERROR, + "be_visitor_factory_svs::" + "visit_factory - " + "codegen for scope failed\n"), + -1); + } + + os_ << be_uidt; + } + + os_ << ");" << be_uidt_nl << be_nl + << global << comp_sname << "::CCM_" << comp_lname + << "_var _ciao_comp =" << be_idt_nl + << global << comp_sname << "::CCM_" << comp_lname + << "::_narrow (_ciao_ec.in ());" << be_uidt_nl << be_nl + << "return this->_ciao_activate_component " + << "(_ciao_comp.in ());"; + } + + os_ << be_uidt_nl + << "}"; + + // In case it was set for the call above. + this->for_finder_ = false; + + return 0; +} + +int +be_visitor_home_svs::visit_finder (be_finder *node) +{ + this->for_finder_ = true; + return this->visit_factory (node); +} + +int be_visitor_home_svs::gen_servant_class (void) { AST_Decl *scope = ScopeAsDecl (node_->defined_in ()); @@ -146,214 +225,102 @@ be_visitor_home_svs::gen_servant_class (void) << be_nl << "{" << be_nl << "}"; - - this->gen_ops_attrs (); - - os_ << be_nl << be_nl - << "/// Factory operations."; - - this->gen_factories_r (node_); - - os_ << be_nl << be_nl - << "/// Finder operations."; - - this->gen_finders_r (node_); - - return 0; -} - -int -be_visitor_home_svs::gen_ops_attrs (void) -{ - os_ << be_nl << be_nl - << "/// All home operations and attributes."; - - node_->get_insert_queue ().reset (); - node_->get_del_queue ().reset (); - node_->get_insert_queue ().enqueue_tail (node_); - - Home_Op_Attr_Generator op_attr_gen (this); - - int status = - node_->traverse_inheritance_graph (op_attr_gen, - &os_, - false, - false); - - if (status == -1) - { - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("be_visitor_home_svs::") - ACE_TEXT ("gen_ops_attrs - ") - ACE_TEXT ("traverse_inheritance_graph() ") - ACE_TEXT ("failed\n")), - -1); - } - - return 0; -} - -int -be_visitor_home_svs::gen_factories (void) -{ - return this->gen_factories_r (node_); -} - -int -be_visitor_home_svs::gen_factories_r (AST_Home *node) -{ - if (node == 0) + + AST_Type *pk = node_->primary_key (); + + if (pk != 0) { - return 0; - } - - if (this->gen_init_ops (node->factories (), false) == -1) - { - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("be_visitor_home_svs::") - ACE_TEXT ("gen_factories_r - ") - ACE_TEXT ("gen_init_ops_i() failed\n")), - -1); - } - - AST_Home *base = node->base_home (); - - return this->gen_factories_r (base); -} + os_ << be_nl << be_nl + << "::" << comp_->name () << "_ptr" << be_nl + << lname << "_Servant::create (" << be_idt_nl + << "::" << pk->name () << " * /* key */)" << be_uidt_nl + << "{" << be_idt_nl + << "throw ::CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8," + << be_nl + << " CORBA::COMPLETED_NO);" + << be_uidt_nl + << "}"; -int -be_visitor_home_svs::gen_finders (void) -{ - os_ << be_nl << be_nl - << "// Finder operations."; + os_ << be_nl << be_nl + << "::" << comp_->name () << "_ptr" << be_nl + << lname << "_Servant::find_by_primary_key (" << be_idt_nl + << "::" << pk->name () << " * /* key */)" << be_uidt_nl + << "{" << be_idt_nl + << "throw ::CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8," + << be_nl + << " CORBA::COMPLETED_NO);" + << be_uidt_nl + << "}"; - return this->gen_finders_r (node_); -} + os_ << be_nl << be_nl + << "void" << be_nl + << lname << "_Servant::remove (" << be_idt_nl + << "::" << pk->name () << " * /* key */)" << be_uidt_nl + << "{" << be_idt_nl + << "throw ::CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8," + << be_nl + << " CORBA::COMPLETED_NO);" + << be_uidt_nl + << "}"; -int -be_visitor_home_svs::gen_finders_r (AST_Home *node) -{ - if (node == 0) - { - return 0; + os_ << be_nl << be_nl + << "::" << pk->name () << " *" << be_nl + << lname << "_Servant::get_primary_key (" << be_idt_nl + << "::" << comp_->name () << "_ptr /* comp */)" << be_uidt_nl + << "{" << be_idt_nl + << "throw ::CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8," + << be_nl + << " CORBA::COMPLETED_NO);" + << be_uidt_nl + << "}"; } - - if (this->gen_init_ops (node->finders (), true) == -1) + + be_home *h = node_; + + while (h != 0) { - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("be_visitor_home_svs::") - ACE_TEXT ("gen_finders_r - ") - ACE_TEXT ("gen_init_ops_i() failed\n")), - -1); - } - - AST_Home *base = node->base_home (); - - return this->gen_finders_r (base); -} - -int -be_visitor_home_svs::gen_init_ops (AST_Home::INIT_LIST & list, - bool finder_list) -{ - AST_Operation **op = 0; - ACE_CString comp_sname_str ( - ScopeAsDecl (comp_->defined_in ())->full_name ()); - const char *comp_sname = comp_sname_str.c_str (); - const char *comp_lname = comp_->local_name ()->get_string (); - const char *global = (comp_sname_str == "" ? "" : "::"); - - for (AST_Home::INIT_LIST::ITERATOR i = list.begin (); - !i.done (); - i.advance ()) - { - i.next (op); - be_operation *bop = be_operation::narrow_from_decl (*op); - - // Retrieve the operation return type. - be_type *bt = be_type::narrow_from_decl (bop->return_type ()); - - if (bt == 0) + if (this->visit_scope (h) != 0) { ACE_ERROR_RETURN ((LM_ERROR, - "be_visitor_home_svs::" - "gen_init_ops - " - "Bad return type\n"), + ACE_TEXT ("be_visitor_home_svs::") + ACE_TEXT ("gen_servant_class - ") + ACE_TEXT ("codegen for scope failed\n")), -1); } - - os_ << be_nl << be_nl; - - be_visitor_operation_rettype rt_visitor (this->ctx_); - - if (bt->accept (&rt_visitor) == -1) + + for (long i = 0; i < h->n_inherits (); ++i) { - ACE_ERROR_RETURN ((LM_ERROR, - "be_visitor_home_svs::" - "gen_init_ops - " - "codegen for return type failed\n"), - -1); - } - - os_ << be_nl - << node_->original_local_name ()->get_string () - << "_Servant::" << bop->local_name (); - - be_visitor_operation_arglist al_visitor (this->ctx_); - - // Finder operations are as yet unimplemented in CIAO, so - // any args will be unused and should be commented out. - al_visitor.unused (finder_list); - - if (bop->accept (&al_visitor) == -1) - { - ACE_ERROR_RETURN ((LM_ERROR, - "be_visitor_home_svs::" - "gen_init_ops - " - "codegen for argument list failed\n"), - -1); - } - - os_ << be_nl - << "{" << be_idt_nl; - - if (finder_list) - { - os_ << "throw ::CORBA::NO_IMPLEMENT ();"; - } - else - { - os_ << "::Components::EnterpriseComponent_var _ciao_ec =" - << be_idt_nl - << "this->executor_->" << bop->local_name () << " ("; - - if (bop->argument_count () != 0) + // A closure of all the supported interfaces is stored + // in the base class 'pd_inherits_flat' member. + be_interface *bi = + be_interface::narrow_from_decl (h->inherits ()[i]); + + bi->get_insert_queue ().reset (); + bi->get_del_queue ().reset (); + bi->get_insert_queue ().enqueue_tail (bi); + + Home_Op_Attr_Generator op_attr_gen (this); + + int status = + bi->traverse_inheritance_graph (op_attr_gen, + &os_, + false, + false); + + if (status == -1) { - os_ << be_idt_nl; - - if (this->visit_scope (bop) == -1) - { - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("be_visitor_home_svs") - ACE_TEXT ("::gen_init_ops - ") - ACE_TEXT ("visit_scope() failed\n")), - -1); - } - - os_ << be_uidt; + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("be_visitor_home_svs::") + ACE_TEXT ("gen_servant_class - ") + ACE_TEXT ("traverse_inheritance_graph() ") + ACE_TEXT ("failed for %s\n"), + bi->full_name ()), + -1); } - os_ << ");" << be_uidt_nl << be_nl - << global << comp_sname << "::CCM_" << comp_lname - << "_var _ciao_comp =" << be_idt_nl - << global << comp_sname << "::CCM_" << comp_lname - << "::_narrow (_ciao_ec.in ());" << be_uidt_nl << be_nl - << "return this->_ciao_activate_component " - << "(_ciao_comp.in ());"; - } - - os_ << be_uidt_nl - << "}"; + } + + h = be_home::narrow_from_decl (h->base_home ()); } 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 67a1f887644..07d305d17bd 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/amh_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_ch.cpp @@ -11,10 +11,6 @@ */ //============================================================================= -ACE_RCSID (be_visitor_interface, - amh_ch, - "$Id$") - be_visitor_amh_interface_ch::be_visitor_amh_interface_ch ( be_visitor_context *ctx ) diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_rh_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_rh_sh.cpp index b2bd001d7b0..6b4d85365b1 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/amh_rh_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_rh_sh.cpp @@ -11,10 +11,6 @@ */ //============================================================================= -ACE_RCSID (be_visitor_interface, - amh_rh_sh, - "$Id$") - be_visitor_amh_rh_interface_sh::be_visitor_amh_rh_interface_sh ( be_visitor_context *ctx ) diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_rh_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_rh_ss.cpp index dd51983df52..e6f482a87f7 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/amh_rh_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_rh_ss.cpp @@ -11,10 +11,6 @@ */ //============================================================================= -ACE_RCSID (be_visitor_interface, - amh_rh_ss, - "$Id$") - be_visitor_amh_rh_interface_ss::be_visitor_amh_rh_interface_ss ( be_visitor_context *ctx ) 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 002cad64667..0747f9b1896 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp @@ -11,10 +11,6 @@ */ //============================================================================= -ACE_RCSID (be_visitor_interface, - amh_sh, - "$Id$") - be_visitor_amh_interface_sh::be_visitor_amh_interface_sh ( be_visitor_context *ctx ) 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 ada8c73a682..354dd6418e9 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/amh_si.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_si.cpp @@ -11,10 +11,6 @@ */ //============================================================================= -ACE_RCSID (be_visitor_interface, - amh_si, - "$Id$") - be_visitor_amh_interface_si::be_visitor_amh_interface_si ( be_visitor_context *ctx ) 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 085e8229696..c703391bff5 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp @@ -10,10 +10,6 @@ */ //============================================================================= -ACE_RCSID (be_visitor_interface, - amh_ss, - "$Id$") - be_visitor_amh_interface_ss::be_visitor_amh_interface_ss ( be_visitor_context *ctx ) diff --git a/TAO/TAO_IDL/be/be_visitor_interface/ami_interface_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/ami_interface_ch.cpp index e59249b3831..aaa2a7b007a 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/ami_interface_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/ami_interface_ch.cpp @@ -19,10 +19,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_interface, - ami_interface_ch, - "$Id$") - // ****************************************************** // Interface visitor for client header // ****************************************************** diff --git a/TAO/TAO_IDL/be/be_visitor_interface/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/any_op_ch.cpp index 0ac3043f090..de879890f1a 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/any_op_ch.cpp @@ -19,10 +19,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_interface, - any_op_ch, - "$Id$") - // *************************************************************************** // Interface visitor for generating Any operator declarations in the client header // *************************************************************************** diff --git a/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp index 88b1d1db183..3d86f89d1ad 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp @@ -15,10 +15,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_interface, - any_op_cs, - "$Id$") - // *************************************************************************** // Interface visitor for generating Any operator declarations in the client // stubs file 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 22f87873065..ede48682033 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,9 +1,5 @@ //$Id$ -ACE_RCSID (be_visitor_interface, - base_proxy_broker_ch, - "$Id$") - be_visitor_interface_base_proxy_broker_ch:: be_visitor_interface_base_proxy_broker_ch (be_visitor_context *ctx) : be_visitor_interface (ctx) diff --git a/TAO/TAO_IDL/be/be_visitor_interface/base_proxy_impl_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/base_proxy_impl_ch.cpp index 0958fa5e06d..8a9fedf8809 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/base_proxy_impl_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/base_proxy_impl_ch.cpp @@ -2,10 +2,6 @@ // $Id$ // -ACE_RCSID (be_visitor_interface, - base_proxy_impl_ch, - "$Id$") - be_visitor_interface_base_proxy_impl_ch:: be_visitor_interface_base_proxy_impl_ch (be_visitor_context *ctx) : be_visitor_interface (ctx) diff --git a/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_ch.cpp index f5f65407bf4..a7d798d2e72 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_ch.cpp @@ -19,10 +19,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_interface, - cdr_op_ch, - "$Id$") - // *************************************************************************** // Interface visitor for generating CDR operator declarations in the client header // *************************************************************************** diff --git a/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp index 97d63ee26f1..536972cde01 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_interface, - cdr_op_cs, - "$Id$") - be_visitor_interface_cdr_op_cs::be_visitor_interface_cdr_op_cs ( be_visitor_context *ctx ) 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 7bd98a387bd..bed337f0d7b 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 @@ -2,10 +2,6 @@ // $Id$ // -ACE_RCSID (be_visitor_interface, - direct_proxy_impl_sh, - "$Id$") - be_visitor_interface_direct_proxy_impl_sh:: be_visitor_interface_direct_proxy_impl_sh (be_visitor_context *ctx) : be_visitor_interface (ctx) diff --git a/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp index 82880cf9668..44fe3052750 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp @@ -2,10 +2,6 @@ //$Id$ // -ACE_RCSID (be_visitor_interface, - direct_proxy_impl_ss, - "$Id$") - be_visitor_interface_direct_proxy_impl_ss:: be_visitor_interface_direct_proxy_impl_ss (be_visitor_context *ctx) : be_visitor_interface (ctx) diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp index 9994a015bc4..1906c1e7e25 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_interface, - interface, - "$Id$") - // ****************************************************** // Generic Interface visitor // ****************************************************** 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 1647d5ca727..8f5a25fa7ec 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp @@ -14,10 +14,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_interface, - interface_ci, - "$Id$") - // ************************************************** // Interface visitor for client inline // ************************************************** 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 811a951aeea..7746b7c5caf 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp @@ -16,11 +16,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_interface, - interface_cs, - "$Id$") - - // ************************************************************ // Interface visitor for client stubs // ************************************************************ diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ih.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ih.cpp index 2f30a58b14d..6c85c9d9985 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ih.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ih.cpp @@ -16,10 +16,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_interface, - interface_ih, - "$Id$") - // ************************************************************ // Interface visitor for implementation header. // ************************************************************ diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_is.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_is.cpp index 39e561b1319..b0a0095e909 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_is.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_is.cpp @@ -20,10 +20,6 @@ // Interface visitor for implementation skeletons. // ************************************************************ -ACE_RCSID (be_visitor_interface, - interface_is, - "$Id$") - be_visitor_interface_is::be_visitor_interface_is (be_visitor_context *ctx) : be_visitor_interface (ctx) { 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 510e0eb8038..cf971a5fa2b 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_interface, - interface_sh, - "$Id$") - // ************************************************************ // Interface visitor for server header. // ************************************************************ diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_si.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_si.cpp index deacb66cb3d..1c280945da4 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_si.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_si.cpp @@ -18,11 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_interface, - interface_si, - "$Id$") - - // ************************************************************************ // Interface visitor for server inline // ************************************************************************ 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 765eae17379..ab590cc86d7 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp @@ -22,12 +22,6 @@ #include "ast_generator.h" #include "ast_string.h" - -ACE_RCSID (be_visitor_interface, - interface_ss, - "$Id$") - - // ************************************************************ // Interface visitor for server skeletons. // ************************************************************ diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_svh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_svh.cpp index a23dcae58b2..0b87eb7d86b 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_svh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_svh.cpp @@ -21,10 +21,6 @@ // Interface visitor for CIAO servant header. // ************************************************************ -ACE_RCSID (be_visitor_interface, - interface_svh, - "$Id$") - be_visitor_interface_svh::be_visitor_interface_svh ( be_visitor_context *ctx) : be_visitor_interface (ctx) diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_svs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_svs.cpp index eab219d0f00..50f7214215a 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_svs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_svs.cpp @@ -21,10 +21,6 @@ // Interface visitor for CIAO servant source. // ************************************************************ -ACE_RCSID (be_visitor_interface, - interface_svs, - "$Id$") - be_visitor_interface_svs::be_visitor_interface_svs ( be_visitor_context *ctx) : be_visitor_interface (ctx) diff --git a/TAO/TAO_IDL/be/be_visitor_interface/proxy_brokers_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/proxy_brokers_ch.cpp index 8b4a8415806..54b0d683465 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/proxy_brokers_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/proxy_brokers_ch.cpp @@ -2,10 +2,6 @@ // $Id$ // -ACE_RCSID (be_visitor_interface, - proxy_brokers_ch, - "$Id$") - be_visitor_interface_proxy_brokers_ch::be_visitor_interface_proxy_brokers_ch ( be_visitor_context *ctx ) diff --git a/TAO/TAO_IDL/be/be_visitor_interface/proxy_impls_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/proxy_impls_ch.cpp index ae043a1c56e..5dd88202211 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/proxy_impls_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/proxy_impls_ch.cpp @@ -2,10 +2,6 @@ // $Id$ // -ACE_RCSID (be_visitor_interface, - base_proxy_broker_impl_ch, - "$Id$") - be_visitor_interface_proxy_impls_ch::be_visitor_interface_proxy_impls_ch ( be_visitor_context *ctx ) 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 fca454e14bf..d94b82e4811 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 @@ -2,10 +2,6 @@ // $Id$ // -ACE_RCSID (be_visitor_interface, - be_visitor_interface_remote_proxy_broker_ch, - "$Id$") - be_visitor_interface_remote_proxy_broker_ch:: be_visitor_interface_remote_proxy_broker_ch (be_visitor_context *ctx) : be_visitor_interface (ctx) 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 8c9fd65d0e0..437b13e8c39 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,10 +2,6 @@ // $Id$ // -ACE_RCSID (be_visitor_interface, - remote_proxy_broker_cs, - "$Id$") - be_visitor_interface_remote_proxy_broker_cs:: be_visitor_interface_remote_proxy_broker_cs (be_visitor_context *ctx) : be_visitor_interface (ctx) diff --git a/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_impl_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_impl_ch.cpp index 6c83426fdee..edc0d161584 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_impl_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_impl_ch.cpp @@ -2,10 +2,6 @@ // $Id$ // -ACE_RCSID (be_visitor_interface, - remote_proxy_impl_ch, - "$Id$") - be_visitor_interface_remote_proxy_impl_ch:: be_visitor_interface_remote_proxy_impl_ch (be_visitor_context *ctx) : be_visitor_interface (ctx) 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 5f574b1e824..d8645ecfb66 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,11 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_interface, - smart_proxy_ch, - "$Id$") - - // ************************************************************ // smart proxy class in header // ************************************************************ 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 0c57077fdff..f7a7312ef38 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 @@ -17,10 +17,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_interface, - smart_proxy_cs, - "$Id$") - // ************************************************************ // be_visitor_interface_smart_proxy_cs // ************************************************************ 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 d330144fd43..4a1d80b9434 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 @@ -2,10 +2,6 @@ // $Id$ // -ACE_RCSID (be_visitor_interface, - base_proxy_broker_sh, - "$Id$") - be_visitor_interface_strategized_proxy_broker_sh:: be_visitor_interface_strategized_proxy_broker_sh (be_visitor_context *ctx) : be_visitor_interface (ctx) 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 4e2dc1f6442..d93e1bed7ae 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 @@ -2,10 +2,6 @@ // $Id$ // -ACE_RCSID (be_visitor_interface, - strategized_proxy_broker_ss, - "$Id$") - be_visitor_interface_strategized_proxy_broker_ss:: be_visitor_interface_strategized_proxy_broker_ss (be_visitor_context *ctx) : be_visitor_interface (ctx) 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 72843dc3259..e71c1ef603b 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp @@ -19,10 +19,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_interface, - tie_sh, - "$Id$") - // ************************************************************ // Interface visitor for server header. // ************************************************************ diff --git a/TAO/TAO_IDL/be/be_visitor_interface/tie_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/tie_ss.cpp index c96e1e7381e..5a7ca700561 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/tie_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/tie_ss.cpp @@ -19,11 +19,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_interface, - tie_ss, - "$Id$") - - // ************************************************************************ // Interface visitor for server inline // ************************************************************************ diff --git a/TAO/TAO_IDL/be/be_visitor_interface_fwd.cpp b/TAO/TAO_IDL/be/be_visitor_interface_fwd.cpp index 1dc664073ea..f48ab16a71e 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface_fwd.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface_fwd.cpp @@ -34,6 +34,3 @@ #include "be_visitor_interface_fwd/cdr_op_ch.cpp" #include "be_visitor_interface_fwd/any_op_ch.cpp" -ACE_RCSID (be, - be_visitor_interface_fwd, - "$Id$") diff --git a/TAO/TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp index d08ba25559b..68d91a090e5 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp @@ -19,10 +19,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_interface_fwd, - any_op_ch, - "$Id$") - // *************************************************************************** // Generates Any operator declarations in the client header // *************************************************************************** diff --git a/TAO/TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ch.cpp index 442d4bd54f0..14098f7776c 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ch.cpp @@ -19,10 +19,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_interface_fwd, - cdr_op_ch, - "$Id$") - // *************************************************************************** // Forward declared interface visitor for generating CDR operator declarations // in the client header. Called if this node is not later defined in the file. 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 5985b56e260..e82099554ad 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 @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_interface_fwd, - interface_fwd_ch, - "$Id$") - // ******************************************************************** // Visitor implementation for the Interface_Fwd type // This one for the client header file diff --git a/TAO/TAO_IDL/be/be_visitor_module/any_op.cpp b/TAO/TAO_IDL/be/be_visitor_module/any_op.cpp index 5819d998f17..4183d1ff45c 100644 --- a/TAO/TAO_IDL/be/be_visitor_module/any_op.cpp +++ b/TAO/TAO_IDL/be/be_visitor_module/any_op.cpp @@ -19,10 +19,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_module, - any_op, - "$Id$") - // *************************************************************************** // Module visitor for generating Any operator declarations in the client header // and stub diff --git a/TAO/TAO_IDL/be/be_visitor_module/cdr_op.cpp b/TAO/TAO_IDL/be/be_visitor_module/cdr_op.cpp index 540057da455..c5a38c93d98 100644 --- a/TAO/TAO_IDL/be/be_visitor_module/cdr_op.cpp +++ b/TAO/TAO_IDL/be/be_visitor_module/cdr_op.cpp @@ -19,10 +19,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_module, - cdr_op, - "$Id: cdr_op.cpp,v 1.2 1999/05/28 02:16:43 coryan Exp ") - // *************************************************************************** // Module visitor for generating CDR operator declarations in the client header // and stub diff --git a/TAO/TAO_IDL/be/be_visitor_module/module.cpp b/TAO/TAO_IDL/be/be_visitor_module/module.cpp index 533430e1624..7df6ead87e6 100644 --- a/TAO/TAO_IDL/be/be_visitor_module/module.cpp +++ b/TAO/TAO_IDL/be/be_visitor_module/module.cpp @@ -18,11 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_module, - module, - "$Id$") - - // ****************************************************** // Generic Module visitor // ****************************************************** diff --git a/TAO/TAO_IDL/be/be_visitor_module/module_ch.cpp b/TAO/TAO_IDL/be/be_visitor_module/module_ch.cpp index 11f1678c300..5e50f841ff8 100644 --- a/TAO/TAO_IDL/be/be_visitor_module/module_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_module/module_ch.cpp @@ -17,10 +17,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_module, - module_ch, - "$Id$") - // ****************************************************** // Module visitor for client header // ****************************************************** diff --git a/TAO/TAO_IDL/be/be_visitor_module/module_ih.cpp b/TAO/TAO_IDL/be/be_visitor_module/module_ih.cpp index 92eacef28aa..987538cb16c 100644 --- a/TAO/TAO_IDL/be/be_visitor_module/module_ih.cpp +++ b/TAO/TAO_IDL/be/be_visitor_module/module_ih.cpp @@ -16,10 +16,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_module, - module_ih, - "$Id$") - // ************************************************************ // Module visitor for server header // ************************************************************ diff --git a/TAO/TAO_IDL/be/be_visitor_module/module_sh.cpp b/TAO/TAO_IDL/be/be_visitor_module/module_sh.cpp index 7466b7aa0f6..fda5be246d0 100644 --- a/TAO/TAO_IDL/be/be_visitor_module/module_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_module/module_sh.cpp @@ -17,10 +17,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_module, - module_sh, - "$Id$") - // ************************************************************ // Module visitor for server header // ************************************************************ diff --git a/TAO/TAO_IDL/be/be_visitor_module/serializer_op.cpp b/TAO/TAO_IDL/be/be_visitor_module/serializer_op.cpp index 46418fd81bb..7e045df87cd 100644 --- a/TAO/TAO_IDL/be/be_visitor_module/serializer_op.cpp +++ b/TAO/TAO_IDL/be/be_visitor_module/serializer_op.cpp @@ -19,10 +19,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_module, - serializer_op, - "$Id: serializer_op.cpp,v 1.2 1999/05/28 02:16:43 coryan Exp ") - // *************************************************************************** // Module visitor for generating Serializer operator declarations in the client header // and stub diff --git a/TAO/TAO_IDL/be/be_visitor_native.cpp b/TAO/TAO_IDL/be/be_visitor_native.cpp index 1f0b7a45424..e2596b00516 100644 --- a/TAO/TAO_IDL/be/be_visitor_native.cpp +++ b/TAO/TAO_IDL/be/be_visitor_native.cpp @@ -27,6 +27,3 @@ #include "be_visitor_native/native_ch.cpp" -ACE_RCSID (be, - be_visitor_native, - "$Id$") diff --git a/TAO/TAO_IDL/be/be_visitor_native/native_ch.cpp b/TAO/TAO_IDL/be/be_visitor_native/native_ch.cpp index a822d9dec14..69736fa3c37 100644 --- a/TAO/TAO_IDL/be/be_visitor_native/native_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_native/native_ch.cpp @@ -21,11 +21,6 @@ #include "be_visitor_typecode/typecode_decl.h" #include "global_extern.h" -ACE_RCSID (be_visitor_native, - native_ch, - "$Id$") - - // ******************************************************************** // Visitor implementation for the Native type // This one for the client header file diff --git a/TAO/TAO_IDL/be/be_visitor_operation.cpp b/TAO/TAO_IDL/be/be_visitor_operation.cpp index e6ceb76baa5..fdd8490a9b9 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation.cpp @@ -42,6 +42,7 @@ #include "be_eventtype.h" #include "be_eventtype_fwd.h" #include "be_home.h" +#include "be_factory.h" #include "be_extern.h" #include "be_helper.h" #include "be_identifier_helper.h" diff --git a/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_sh.cpp b/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_sh.cpp index 2bdca1eeb58..f451004861e 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_sh.cpp @@ -19,10 +19,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_operation, - operation_amh_rh_sh, - "$Id$") - // ****************************************************** // Visitor for generating AMH-RH skeleton for "operation" // in skeleton header. 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 41fff5467c0..0eb913f7e25 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 @@ -10,10 +10,6 @@ */ //============================================================================= -ACE_RCSID (be_visitor_operation, - amh_rh_ss, - "$Id$") - be_visitor_amh_rh_operation_ss::be_visitor_amh_rh_operation_ss ( be_visitor_context *ctx ) 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 a32733c740c..d55eec5a728 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp @@ -19,10 +19,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_operation, - amh_sh, - "$Id$") - // ****************************************************** // Visitor for generating AMH skeleton for "operation" in skeleton header. // ****************************************************** 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 c03dd389ea8..35be7beb37c 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp @@ -10,10 +10,6 @@ */ //============================================================================= -ACE_RCSID (be_visitor_operation, - amh_ss, - "$Id$") - #include "ace/SString.h" be_visitor_amh_operation_ss::be_visitor_amh_operation_ss ( diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_ch.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_ch.cpp index 499e8884793..c36080a0701 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/ami_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_ch.cpp @@ -19,10 +19,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_operation, - operation_ami_ch, - "$Id$") - // ****************************************************** // Visitor for generating AMI stub for "operation" in client header. // ****************************************************** 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 a5925da6fc4..bc66da364c1 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp @@ -19,10 +19,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_operation, - operation_ami_cs, - "$Id$") - // ************************************************************ // Operation visitor for client stubs // ************************************************************ 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 07a98139f2d..44f2dd6bbec 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 @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_operation, - ami_exception_holder_operation_cs, - "$Id$") - // ************************************************************ // Operation visitor for client stubs // ************************************************************ 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 3533db0816f..a340c4091fe 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 @@ -20,10 +20,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_operation, - ami_handler_reply_stub_operation_ch, - "$Id$") - // ************************************************************ // Operation visitor for server header // ************************************************************ 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 a17b1f890c7..92e13bfef0c 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 @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_operation, - ami_handler_reply_stub_operation_cs, - "$Id$") - // ************************************************************ // Operation visitor for client stubs. // ************************************************************ diff --git a/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp b/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp index 9ed77596b7c..675b1518896 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp @@ -112,6 +112,48 @@ be_visitor_operation_arglist::visit_operation (be_operation *node) } int +be_visitor_operation_arglist::visit_factory (be_factory *node) +{ + TAO_OutStream *os = this->ctx_->stream (); + bool has_args = node->argument_count () > 0; + + *os << " ("; + + if (has_args) + { + *os << be_idt_nl; + } + + // All we do is hand over code generation to our scope. + if (this->visit_scope (node) == -1) + { + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("be_visitor_operation_arglist::") + ACE_TEXT ("visit_factory - ") + ACE_TEXT ("codegen for scope failed\n")), + -1); + } + + if (!has_args) + { + *os << "void"; + } + + *os << ")"; + + if (has_args) + { + *os << be_uidt; + } + + // At present, visit_factory() is called only from the home + // servant source visitor, so we don't need to check the state + // for semicolon generation. + + return 0; +} + +int be_visitor_operation_arglist::visit_argument (be_argument *node) { // Get the visitor that will dump the argument's mapping in the operation @@ -122,33 +164,27 @@ be_visitor_operation_arglist::visit_argument (be_argument *node) // defined. We need this since argument types may very well be declared // inside the scope of the interface node. In such cases, we would like to // generate the appropriate relative scoped names. - be_operation *op = this->ctx_->be_scope_as_operation (); - - if (!op) - { - ACE_ERROR_RETURN ((LM_ERROR, - "(%N:%l) be_visitor_arglist::" - "visit_argument - " - "Bad operation\n"), - -1); - } + be_operation *op = + be_operation::narrow_from_scope (this->ctx_->scope ()); + be_interface *intf = 0; // We need the interface node in which this operation was defined. However, // if this operation node was an attribute node in disguise, we get this // information from the context - be_interface *intf = this->ctx_->attribute () - ? be_interface::narrow_from_scope (this->ctx_->attribute ()->defined_in ()) - : be_interface::narrow_from_scope (op->defined_in ()); - - if (!intf) + if (op == 0) { - ACE_ERROR_RETURN ((LM_ERROR, - "(%N:%l) be_visitor_arglist::" - "visit_argument - " - "Bad interface\n"), - -1); + be_factory *f = + be_factory::narrow_from_scope (this->ctx_->scope ()); + + intf = be_interface::narrow_from_scope (f->defined_in ()); } - + else + { + intf = this->ctx_->attribute () + ? be_interface::narrow_from_scope (this->ctx_->attribute ()->defined_in ()) + : be_interface::narrow_from_scope (op->defined_in ()); + } + // Set new scope. ctx.scope (intf); diff --git a/TAO/TAO_IDL/be/be_visitor_operation/argument.cpp b/TAO/TAO_IDL/be/be_visitor_operation/argument.cpp index 413cb6a125e..90e49b3122e 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/argument.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/argument.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_operation, - argument, - "$Id$") - // ************************************************************ // Generic operation visitor to handle the pre/post // do_static_call/upcall stuff with arguments. @@ -94,13 +90,14 @@ be_visitor_operation_argument::visit_argument (be_argument *node) // signature. be_visitor_context ctx (*this->ctx_); - // first grab the interface definition inside which this operation is + // First grab the interface definition inside which this operation is // defined. We need this since argument types may very well be declared // inside the scope of the interface node. In such cases, we would like to // generate the appropriate relative scoped names. - be_operation *op = this->ctx_->be_scope_as_operation (); + be_operation *op = + be_operation::narrow_from_scope (this->ctx_->scope ()); - if (!op) + if (op == 0) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_arglist::" diff --git a/TAO/TAO_IDL/be/be_visitor_operation/argument_invoke.cpp b/TAO/TAO_IDL/be/be_visitor_operation/argument_invoke.cpp index d222235b04d..b3e39922099 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/argument_invoke.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/argument_invoke.cpp @@ -20,10 +20,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_operation, - argument_invoke, - "$Id$") - // ************************************************************ // operation visitor to handle the passing of arguments to the CDR operators // ************************************************************ diff --git a/TAO/TAO_IDL/be/be_visitor_operation/argument_marshal.cpp b/TAO/TAO_IDL/be/be_visitor_operation/argument_marshal.cpp index 4cab39b61bf..4c043b5fcd8 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/argument_marshal.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/argument_marshal.cpp @@ -20,10 +20,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_operation, - argument_marshal, - "$Id$") - // ************************************************************ // operation visitor to handle the passing of arguments to the CDR operators // ************************************************************ @@ -199,7 +195,8 @@ be_visitor_args_decl::visit_array (be_array *node) TAO_OutStream *os = this->ctx_->stream (); // retrieve the field node - be_argument *f = this->ctx_->be_node_as_argument (); + be_argument *f = + be_argument::narrow_from_decl (this->ctx_->node ()); if (f == 0) { diff --git a/TAO/TAO_IDL/be/be_visitor_operation/base_proxy_impl_ch.cpp b/TAO/TAO_IDL/be/be_visitor_operation/base_proxy_impl_ch.cpp index 04890bc1de8..e5e32b8f36b 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/base_proxy_impl_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/base_proxy_impl_ch.cpp @@ -1,9 +1,5 @@ // $Id$ -ACE_RCSID (be_visitor_operation, - x_proxy_impl_xh, - "$Id$") - be_visitor_operation_base_proxy_impl_ch:: be_visitor_operation_base_proxy_impl_ch (be_visitor_context *ctx) : be_visitor_scope (ctx) 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 314e5c95c5c..b7b88c34868 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 @@ -1,9 +1,5 @@ // $Id$ -ACE_RCSID (be_visitor_operation, - direct_proxy_impl_ss, - "$Id$") - be_visitor_operation_direct_proxy_impl_ss:: be_visitor_operation_direct_proxy_impl_ss (be_visitor_context *ctx) : be_visitor_operation (ctx) diff --git a/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_cs.cpp index cc1ecbc87fe..bcce0879377 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_cs.cpp @@ -19,10 +19,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_operation, - exceptlist_cs, - "$Id$") - // **************************************************************************** // visitor to generate the exception list for operations // **************************************************************************** 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 a309fde7125..e9909bd084a 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_ss.cpp @@ -17,10 +17,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_operation, - exceptlist_ss, - "$Id$") - // **************************************************************************** // visitor to generate the exception list for operations (skeleton/server_side) // **************************************************************************** diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp index 2475244e6ee..16a275fcc90 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_operation, - operation, - "$Id$") - // ************************************************************ // Generic Operation visitor // ************************************************************ diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp index a1a1e624389..b25a6e20323 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_operation, - operation_cs, - "$Id$") - // ************************************************************ // Operation visitor for client stubs // ************************************************************ diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_ih.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_ih.cpp index f0a28386fb2..dc731a329ba 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation_ih.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_ih.cpp @@ -16,10 +16,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_operation, - operation_ih, - "$Id$") - // ************************************************************ // Operation visitor for implementation header. // ************************************************************ diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_is.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_is.cpp index e3390be880f..5e43d615f6e 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation_is.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_is.cpp @@ -16,10 +16,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_operation, - operation_is, - "$Id$") - // ************************************************************ // Operation visitor for implementation skeleton // ************************************************************ 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 92bc5ab2eec..91c8899e7ce 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_operation, - operation_sh, - "$Id$") - // ************************************************************ // Operation visitor for server header // ************************************************************ 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 5b0fe601a71..1b713477c42 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp @@ -18,11 +18,6 @@ // // ============================================================================ - -ACE_RCSID (be_visitor_operation, - operation_ss, - "$Id$") - // ************************************************************ // Operation visitor for server skeletons // ************************************************************ 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 b30e977fb54..eeab69929ab 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 @@ -1,9 +1,5 @@ // $Id$ -ACE_RCSID (be_visitor_operation, - proxy_impl_xh, - "$Id$") - be_visitor_operation_proxy_impl_xh::be_visitor_operation_proxy_impl_xh ( be_visitor_context *ctx ) diff --git a/TAO/TAO_IDL/be/be_visitor_operation/remote_proxy_impl_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/remote_proxy_impl_cs.cpp index b6c72a81241..9d73f192cd8 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/remote_proxy_impl_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/remote_proxy_impl_cs.cpp @@ -1,9 +1,5 @@ // $Id$ -ACE_RCSID (be_visitor_operation, - be_visitor_operation_remote_proxy_impl_cs, - "$Id$") - // ************************************************************ // Operation visitor for client stubs // ************************************************************ diff --git a/TAO/TAO_IDL/be/be_visitor_operation/rettype.cpp b/TAO/TAO_IDL/be/be_visitor_operation/rettype.cpp index c11e30e7645..f2ef524a746 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/rettype.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/rettype.cpp @@ -18,11 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_operation, - rettype, - "$Id$") - - // **************************************************************************** // Operation visitor for return types. This generates the mapping for a return // type in an operation signature diff --git a/TAO/TAO_IDL/be/be_visitor_operation/rettype_return_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/rettype_return_cs.cpp index fa7e91171b3..134fbd36c3e 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/rettype_return_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/rettype_return_cs.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_operation, - rettype_return_cs, - "$Id$") - // ************************************************************ // be_visitor_operation_rettype_return_cs // diff --git a/TAO/TAO_IDL/be/be_visitor_operation/smart_proxy_ch.cpp b/TAO/TAO_IDL/be/be_visitor_operation/smart_proxy_ch.cpp index 1e34b2b8db5..2b23f85810a 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/smart_proxy_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/smart_proxy_ch.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_operation, - smart_proxy_ch, - "$Id$") - // ****************************************************** // Primary visitor for "operation" in client header. // ****************************************************** diff --git a/TAO/TAO_IDL/be/be_visitor_operation/smart_proxy_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/smart_proxy_cs.cpp index 984a49b9da8..7533a887af9 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/smart_proxy_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/smart_proxy_cs.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_operation, - operation_smart_proxy_cs, - "$Id$") - // ************************************************************ // Operation visitor for client stubs // ************************************************************ diff --git a/TAO/TAO_IDL/be/be_visitor_operation/tie_sh.cpp b/TAO/TAO_IDL/be/be_visitor_operation/tie_sh.cpp index 6042227dc34..9f2da4c1567 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/tie_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/tie_sh.cpp @@ -19,10 +19,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_operation, - tie_sh, - "$Id$") - // ************************************************************ // Operation visitor for server header for TIE class operations. // ************************************************************ diff --git a/TAO/TAO_IDL/be/be_visitor_operation/tie_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/tie_ss.cpp index 8675c7ecd8f..4a93be560be 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/tie_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/tie_ss.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_operation, - tie_ss, - "$Id$") - // ************************************************************ // Operation visitor for server inline for TIE class operations. // ************************************************************ 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 857f14ec7f9..7dcad5328ce 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 @@ -17,11 +17,6 @@ // // ============================================================================ - -ACE_RCSID (be_visitor_operation, - upcall_command_ss, - "$Id$") - be_visitor_operation_upcall_command_ss ::be_visitor_operation_upcall_command_ss ( be_visitor_context *ctx) diff --git a/TAO/TAO_IDL/be/be_visitor_root.cpp b/TAO/TAO_IDL/be/be_visitor_root.cpp index c98d61da331..9d462e5bec4 100644 --- a/TAO/TAO_IDL/be/be_visitor_root.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root.cpp @@ -83,6 +83,3 @@ #include "be_visitor_root/cdr_op.cpp" #include "be_visitor_root/serializer_op.cpp" -ACE_RCSID (be, - be_visitor_root, - "$Id$") diff --git a/TAO/TAO_IDL/be/be_visitor_root/any_op.cpp b/TAO/TAO_IDL/be/be_visitor_root/any_op.cpp index 9455e261b8a..8e0265cad01 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/any_op.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/any_op.cpp @@ -19,10 +19,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_root, - any_op, - "$Id$") - // *************************************************************************** // Root visitor for generating Any operator declarations in the client header // and stub diff --git a/TAO/TAO_IDL/be/be_visitor_root/cdr_op.cpp b/TAO/TAO_IDL/be/be_visitor_root/cdr_op.cpp index 24bee065237..535418a2b75 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/cdr_op.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/cdr_op.cpp @@ -19,10 +19,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_root, - cdr_op, - "$Id$") - // *************************************************************************** // Root visitor for generating CDR operator declarations in the client header // and stub diff --git a/TAO/TAO_IDL/be/be_visitor_root/root.cpp b/TAO/TAO_IDL/be/be_visitor_root/root.cpp index 583c15c9058..76d1e5fc02c 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/root.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/root.cpp @@ -13,9 +13,6 @@ // Aniruddha Gokhale // // ============================================================================ -ACE_RCSID (be_visitor_root, - root, - "$Id$") // Generic Root visitor be_visitor_root::be_visitor_root (be_visitor_context *ctx) diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_ch.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_ch.cpp index 85387b345d0..058d984f19d 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/root_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/root_ch.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_root, - root_ch, - "$Id$") - // ******************************** // Root visitor for client header // ******************************** diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_ci.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_ci.cpp index 4a6001866d6..8391127c9c4 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/root_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/root_ci.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_root, - root_ci, - "$Id$") - // ********************************* // Root visitor for client inline // ********************************* diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_cs.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_cs.cpp index 2fcc8acd791..991ff9cdab4 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/root_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/root_cs.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_root, - root_cs, - "$Id$") - // *********************************** // Root visitor for client stubs // *********************************** diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_ex_idl.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_ex_idl.cpp index 9d0a84e284c..9fdbfd63de8 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/root_ex_idl.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/root_ex_idl.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_root, - root_ex_idl, - "$Id$") - // ******************************** // Root visitor for CIAO executor IDL // ******************************** diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_exh.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_exh.cpp index 1d60ddbd9ee..aa0b772c5e6 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/root_exh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/root_exh.cpp @@ -19,10 +19,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_root, - root_exh, - "$Id$") - // ******************************** // Root visitor for CIAO exec impl header // ******************************** diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_exs.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_exs.cpp index 2a3d8040e64..8c0793f1f0f 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/root_exs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/root_exs.cpp @@ -19,10 +19,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_root, - root_exs, - "$Id$") - // ******************************** // Root visitor for CIAO exec impl source // ******************************** diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_ih.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_ih.cpp index 5ff8eea3403..9164d14cc90 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/root_ih.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/root_ih.cpp @@ -16,10 +16,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_root, - root_ih, - "$Id$") - // *********************************** // Root visitor for implementation header // *********************************** diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_is.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_is.cpp index 82f3fe275c2..f2f263455a4 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/root_is.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/root_is.cpp @@ -17,10 +17,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_root, - root_is, - "$Id$") - // ****************************************************** // Root visitor for implementation skeletons // ****************************************************** diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_sh.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_sh.cpp index affeb35db6c..8ca6ab5cd4c 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/root_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/root_sh.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_root, - root_sh, - "$Id$") - // *********************************** // Root visitor for server header // *********************************** diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_si.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_si.cpp index 86c0b7e6e71..10cc482f6c9 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/root_si.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/root_si.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_root, - root_si, - "$Id$") - // *********************************************** // Root visitor for server inline // *********************************************** diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_ss.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_ss.cpp index dbc1581678b..267b582ebb5 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/root_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/root_ss.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_root, - root_ss, - "$Id$") - // ****************************************************** // Root visitor for server skeletons // ****************************************************** diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_sth.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_sth.cpp index 61cd0b6954f..77449d65659 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/root_sth.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/root_sth.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_root, - root_sth, - "$Id$") - // **************************************** // Root visitor for server template header // **************************************** diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_svh.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_svh.cpp index 7b1fe47680d..03be1b87b28 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/root_svh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/root_svh.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_root, - root_svh, - "$Id$") - // ******************************** // Root visitor for CIAO servant header // ******************************** diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_svs.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_svs.cpp index 72b14ab719b..21359af289e 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/root_svs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/root_svs.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_root, - root_svs, - "$Id$") - // ******************************** // Root visitor for CIAO servant source // ******************************** diff --git a/TAO/TAO_IDL/be/be_visitor_root/serializer_op.cpp b/TAO/TAO_IDL/be/be_visitor_root/serializer_op.cpp index 09ee1429df7..6d11e368b83 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/serializer_op.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/serializer_op.cpp @@ -19,10 +19,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_root, - serializer_op, - "$Id$") - // *************************************************************************** // Root visitor for generating Serializer operator declarations in the client header // and stub diff --git a/TAO/TAO_IDL/be/be_visitor_sequence.cpp b/TAO/TAO_IDL/be/be_visitor_sequence.cpp index ef93fee6254..e4728d0bae7 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence.cpp @@ -60,6 +60,3 @@ #include "be_visitor_sequence/sequence_ch.cpp" #include "be_visitor_sequence/sequence_cs.cpp" -ACE_RCSID (be, - be_visitor_sequence, - "$Id$") diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp index 9195f4c7d3e..9770302e05a 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_sequence, - any_op_ch, - "$Id$") - // *************************************************************************** // Sequence visitor for generating Any operator declarations in the client header // *************************************************************************** diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp index 217120aeb16..22bb455d2a6 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_sequence, - any_op_cs, - "$Id$") - // *************************************************************************** // Sequence visitor for generating Any operator declarations in the client // stubs file diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/buffer_type.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/buffer_type.cpp index 7cb42484994..17bd24f6116 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/buffer_type.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/buffer_type.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_sequence, - buffer_type, - "$Id$") - // **************************************************************** // We have to generate the buffer type in the constructor // **************************************************************** diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp index ee680e0aad6..eaeb5d75d03 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp @@ -19,10 +19,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_sequence, - cdr_op_ch, - "$Id$") - // *************************************************************************** // Sequence visitor for generating CDR operator declarations in the client header // *************************************************************************** diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp index a5f751cfe42..bab35e07843 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp @@ -15,10 +15,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_sequence, - cdr_op_cs, - "$Id$") - // *************************************************************************** // Sequence visitor for generating CDR operator declarations in the client // stubs file. diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_base.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_base.cpp index 9f838684f28..31437ba25d4 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_base.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_base.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_sequence, - sequence_base, - "$Id$") - // **************************************************************** // We have to generate the parameters for the template that implements // each sequence type. 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 ae7683e7c35..00206c7884b 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_sequence, - sequence_ch, - "$Id$") - // Root visitor for client header. be_visitor_sequence_ch::be_visitor_sequence_ch (be_visitor_context *ctx) : be_visitor_decl (ctx) 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 00b6b85f23f..7fc4aeb9d54 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_sequence, - sequence_cs, - "$Id$") - // ************************************************************ // Root visitor for client stub class // ************************************************************ diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_ch.cpp index 2a925960445..8f4d829e939 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_ch.cpp @@ -19,10 +19,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_sequence, - serializer_op_ch, - "$Id$") - // *************************************************************************** // Sequence visitor for generating Serializer operator declarations in the client header // *************************************************************************** diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp index bb93ef0fe19..550036b63e1 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp @@ -15,10 +15,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_sequence, - serializer_op_cs, - "$Id$") - // *************************************************************************** // Sequence visitor for generating Serializer operator declarations in the client // stubs file. @@ -366,9 +362,10 @@ be_visitor_sequence_serializer_op_cs::visit_enum (be_enum *node) // the total length of the sequence as a cross product of the // dimensions. - be_sequence *sequence = this->ctx_->be_node_as_sequence (); + be_sequence *sequence = + be_sequence::narrow_from_decl (this->ctx_->node ()); - if (!sequence) + if (sequence == 0) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_sequence_serializer_op_cs::" @@ -502,9 +499,10 @@ be_visitor_sequence_serializer_op_cs::visit_predefined_type ( // the total length of the sequence as a cross product of the // dimensions. - be_sequence *sequence = this->ctx_->be_node_as_sequence (); + be_sequence *sequence = + be_sequence::narrow_from_decl (this->ctx_->node ()); - if (!sequence) + if (sequence == 0) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_sequence_serializer_op_cs::" @@ -750,9 +748,10 @@ int be_visitor_sequence_serializer_op_cs::visit_node (be_type *bt) { TAO_OutStream *os = this->ctx_->stream (); - be_sequence *node = this->ctx_->be_node_as_sequence (); + be_sequence *node = + be_sequence::narrow_from_decl (this->ctx_->node ()); - if (!node) + if (node == 0) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_sequence_serializer_op_cs::" diff --git a/TAO/TAO_IDL/be/be_visitor_structure/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_structure/any_op_ch.cpp index a296c638a10..cbedd66511d 100644 --- a/TAO/TAO_IDL/be/be_visitor_structure/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_structure/any_op_ch.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_structure, - any_op_ch, - "$Id$") - // *************************************************************************** // Structure visitor for generating Any operator declarations in the client header // *************************************************************************** diff --git a/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp index ec9ee323817..856fe28dd26 100644 --- a/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_structure, - any_op_cs, - "$Id$") - // *************************************************************************** // Structure visitor for generating Any operator declarations in the client // stubs file diff --git a/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_ch.cpp index 7d9996e6df4..55d1730d332 100644 --- a/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_ch.cpp @@ -19,10 +19,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_structure, - cdr_op_ch, - "$Id$") - // *************************************************************************** // Structure visitor for generating CDR operator declarations in the client header // *************************************************************************** diff --git a/TAO/TAO_IDL/be/be_visitor_structure/serializer_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_structure/serializer_op_ch.cpp index 9e2cfaf1fda..7e2ad9ec96d 100644 --- a/TAO/TAO_IDL/be/be_visitor_structure/serializer_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_structure/serializer_op_ch.cpp @@ -19,10 +19,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_structure, - serializer_op_ch, - "$Id$") - #include "global_extern.h" // *************************************************************************** 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 4b3994baf7f..376dde6e038 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 @@ -20,10 +20,6 @@ #include "utl_identifier.h" -ACE_RCSID (be_visitor_structure, - serializer_op_cs, - "$Id$") - be_visitor_structure_serializer_op_cs::be_visitor_structure_serializer_op_cs ( be_visitor_context *ctx ) diff --git a/TAO/TAO_IDL/be/be_visitor_structure/structure.cpp b/TAO/TAO_IDL/be/be_visitor_structure/structure.cpp index 7b766916e55..4fae0895d4a 100644 --- a/TAO/TAO_IDL/be/be_visitor_structure/structure.cpp +++ b/TAO/TAO_IDL/be/be_visitor_structure/structure.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_structure, - structure, - "$Id$") - be_visitor_structure::be_visitor_structure (be_visitor_context *ctx) : be_visitor_scope (ctx) { 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 180be301e35..a86e4f6c548 100644 --- a/TAO/TAO_IDL/be/be_visitor_structure/structure_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_structure/structure_ch.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_structure, - structure_ch, - "$Id$") - // ****************************************************** // for client header // ****************************************************** 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 8feffbd15ea..9f29cdb8a7a 100644 --- a/TAO/TAO_IDL/be/be_visitor_structure/structure_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_structure/structure_ci.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_structure, - structure_ci, - "$Id$") - // ****************************************************** // for client inline // ****************************************************** 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 2fe589782d5..42055544ee9 100644 --- a/TAO/TAO_IDL/be/be_visitor_structure/structure_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_structure/structure_cs.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_structure, - structure_cs, - "$Id$") - // *************************************************************************** // For client stubs. // *************************************************************************** diff --git a/TAO/TAO_IDL/be/be_visitor_structure_fwd.cpp b/TAO/TAO_IDL/be/be_visitor_structure_fwd.cpp index 85cb72ef70f..baca963592c 100644 --- a/TAO/TAO_IDL/be/be_visitor_structure_fwd.cpp +++ b/TAO/TAO_IDL/be/be_visitor_structure_fwd.cpp @@ -27,6 +27,3 @@ #include "be_visitor_structure_fwd/structure_fwd_ch.cpp" -ACE_RCSID (be, - be_visitor_structure_fwd, - "$Id$") 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 0df96e7e10a..608d2929e94 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 @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_structure_fwd, - structure_fwd_ch, - "$Id$") - be_visitor_structure_fwd_ch::be_visitor_structure_fwd_ch ( be_visitor_context *ctx ) diff --git a/TAO/TAO_IDL/be/be_visitor_template_export.cpp b/TAO/TAO_IDL/be/be_visitor_template_export.cpp index 1ce1e9058f0..f085d8f6789 100644 --- a/TAO/TAO_IDL/be/be_visitor_template_export.cpp +++ b/TAO/TAO_IDL/be/be_visitor_template_export.cpp @@ -21,10 +21,6 @@ #include "be_predefined_type.h" #include "ace/Log_Msg.h" -ACE_RCSID (be, - be_visitor_template_export, - "$Id$") - be_visitor_template_export::be_visitor_template_export ( be_visitor_context *ctx) : be_visitor_scope (ctx) diff --git a/TAO/TAO_IDL/be/be_visitor_traits.cpp b/TAO/TAO_IDL/be/be_visitor_traits.cpp index 92b9d5b3c4c..eec76db6b21 100644 --- a/TAO/TAO_IDL/be/be_visitor_traits.cpp +++ b/TAO/TAO_IDL/be/be_visitor_traits.cpp @@ -41,10 +41,6 @@ #include "ace/Log_Msg.h" -ACE_RCSID (be, - be_visitor_traits, - "$Id$") - be_visitor_traits::be_visitor_traits (be_visitor_context *ctx) : be_visitor_scope (ctx) { diff --git a/TAO/TAO_IDL/be/be_visitor_typecode.cpp b/TAO/TAO_IDL/be/be_visitor_typecode.cpp index e8802efb7a0..e22fea492f7 100644 --- a/TAO/TAO_IDL/be/be_visitor_typecode.cpp +++ b/TAO/TAO_IDL/be/be_visitor_typecode.cpp @@ -56,7 +56,3 @@ #include "be_visitor_typecode/union_typecode.cpp" #include "be_visitor_typecode/value_typecode.cpp" - -ACE_RCSID (be, - be_visitor_typecode, - "$Id$") diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_decl.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_decl.cpp index e29c13dc981..61a9071639c 100644 --- a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_decl.cpp +++ b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_decl.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_typecode, - typecode_decl, - "$Id$") - // ****************************************************** // TypeCode declarations // ****************************************************** diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp index a456530ad0a..8f04147d8b1 100644 --- a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp +++ b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_typecode, - typecode_defn, - "$Id$") - #include "be_interface_fwd.h" // This is an implementation of C++ "scoped lock" idiom in order to diff --git a/TAO/TAO_IDL/be/be_visitor_typedef.cpp b/TAO/TAO_IDL/be/be_visitor_typedef.cpp index 1e3ebf45077..fa6c1f9847e 100644 --- a/TAO/TAO_IDL/be/be_visitor_typedef.cpp +++ b/TAO/TAO_IDL/be/be_visitor_typedef.cpp @@ -57,6 +57,3 @@ #include "be_visitor_typedef/serializer_op_ch.cpp" #include "be_visitor_typedef/serializer_op_cs.cpp" -ACE_RCSID (be, - be_visitor_typedef, - "$Id$") diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/any_op_ch.cpp index 16d6a33b9ba..05dc55b4f1f 100644 --- a/TAO/TAO_IDL/be/be_visitor_typedef/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_typedef/any_op_ch.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_typedef, - any_op_ch, - "$Id$") - // *************************************************************************** // Typedef visitor for generating Any operator declarations in the client header // *************************************************************************** diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/any_op_cs.cpp index e0947404ea1..4a6ff486404 100644 --- a/TAO/TAO_IDL/be/be_visitor_typedef/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_typedef/any_op_cs.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_typedef, - any_op_cs, - "$Id$") - // *************************************************************************** // Typedef visitor for generating Any operator declarations in the client // stubs file diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/cdr_op_ch.cpp index f6874a22e59..fa7ad3f32a8 100644 --- a/TAO/TAO_IDL/be/be_visitor_typedef/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_typedef/cdr_op_ch.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_typedef, - cdr_op_ch, - "$Id$") - // *************************************************************************** // Typedef visitor for generating Cdr operator declarations in the client header // *************************************************************************** diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/cdr_op_cs.cpp index 014d7f5a4ba..429568ab73f 100644 --- a/TAO/TAO_IDL/be/be_visitor_typedef/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_typedef/cdr_op_cs.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_typedef, - cdr_op_cs, - "$Id$") - // *************************************************************************** // Typedef visitor for generating CDR operator declarations in the client // stubs file diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/serializer_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/serializer_op_ch.cpp index b57fb33f32a..3c2810e239e 100644 --- a/TAO/TAO_IDL/be/be_visitor_typedef/serializer_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_typedef/serializer_op_ch.cpp @@ -19,10 +19,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_typedef, - serializer_op_ch, - "$Id$") - // *************************************************************************** // Typedef visitor for generating Serializer operator declarations in the client header // *************************************************************************** diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/serializer_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/serializer_op_cs.cpp index 8e44708dead..1d44a5c1c9a 100644 --- a/TAO/TAO_IDL/be/be_visitor_typedef/serializer_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_typedef/serializer_op_cs.cpp @@ -19,10 +19,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_typedef, - serializer_op_cs, - "$Id$") - // *************************************************************************** // Typedef visitor for generating Serializer operator declarations in the client // stubs file diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/typedef.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/typedef.cpp index 001de4594ab..cf9c62a2a63 100644 --- a/TAO/TAO_IDL/be/be_visitor_typedef/typedef.cpp +++ b/TAO/TAO_IDL/be/be_visitor_typedef/typedef.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_typedef, - typedef, - "$Id$") - // ****************************************************** // Generic typedef visitor. // ****************************************************** diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp index 8e3f36f94b1..303762ff705 100644 --- a/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID(be_visitor_typedef, - typedef_ch, - "$Id$") - // ****************************************************** // Typedef visitor for client header // ****************************************************** 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 fff13e232c4..213d8087a24 100644 --- a/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ci.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_typedef, - typedef_ci, - "$Id$") - // ****************************************************** // Typedef visitor for client inline // ****************************************************** diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/typedef_cs.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/typedef_cs.cpp index c17693c7226..54296355f7f 100644 --- a/TAO/TAO_IDL/be/be_visitor_typedef/typedef_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_typedef/typedef_cs.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_typedef, - typedef_cs, - "$Id$") - // ****************************************************** // Typedef visitor for client stubs // ****************************************************** diff --git a/TAO/TAO_IDL/be/be_visitor_union.cpp b/TAO/TAO_IDL/be/be_visitor_union.cpp index dc35ee0b5c8..ca8209c889b 100644 --- a/TAO/TAO_IDL/be/be_visitor_union.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union.cpp @@ -49,6 +49,3 @@ #include "be_visitor_union/serializer_op_ch.cpp" #include "be_visitor_union/serializer_op_cs.cpp" -ACE_RCSID (be, - be_visitor_union, - "$Id$") diff --git a/TAO/TAO_IDL/be/be_visitor_union/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union/any_op_ch.cpp index 897acca7ad6..c7bfb715374 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/any_op_ch.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_union, - any_op_ch, - "$Id$") - // *************************************************************************** // Union visitor for generating Any operator declarations in the client header // *************************************************************************** diff --git a/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp index b84932013c1..dc56527b5ef 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_union, - any_op_cs, - "$Id$") - // *************************************************************************** // Union visitor for generating Any operator declarations in the client // stubs file diff --git a/TAO/TAO_IDL/be/be_visitor_union/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union/cdr_op_ch.cpp index b91c87710e8..315248ef6b3 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/cdr_op_ch.cpp @@ -19,10 +19,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_union, - cdr_op_ch, - "$Id$") - // *************************************************************************** // Union visitor for generating CDR operator declarations in the client header // *************************************************************************** diff --git a/TAO/TAO_IDL/be/be_visitor_union/discriminant_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union/discriminant_ch.cpp index 3000070664f..f6b840ba837 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/discriminant_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/discriminant_ch.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_union, - discriminant_ch, - "$Id$") - // ************************************************************************* // Visitor for discriminant in client header file. // ************************************************************************* @@ -41,7 +37,8 @@ int be_visitor_union_discriminant_ch::visit_enum (be_enum *node) { // Get the enclosing union backend. - be_union *bu = this->ctx_->be_node_as_union (); + be_union *bu = + be_union::narrow_from_decl (this->ctx_->node ()); be_type *bt = 0; // Check if we are visiting this node via a visit to a typedef node. @@ -95,7 +92,8 @@ be_visitor_union_discriminant_ch::visit_predefined_type (be_predefined_type *node) { // get the enclosing union backend. - be_union *bu = this->ctx_->be_node_as_union (); + be_union *bu = + be_union::narrow_from_decl (this->ctx_->node ()); be_type *bt = 0; // Check if we are visiting this node via a visit to a typedef node. diff --git a/TAO/TAO_IDL/be/be_visitor_union/discriminant_ci.cpp b/TAO/TAO_IDL/be/be_visitor_union/discriminant_ci.cpp index ceb5d435f18..5fb93efe53e 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/discriminant_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/discriminant_ci.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_union, - discriminant_ci, - "$Id$") - // ************************************************************************* // be_visitor_discriminant_ci - visitor for discriminant in client inline file // ************************************************************************* @@ -41,7 +37,7 @@ int be_visitor_union_discriminant_ci::visit_enum (be_enum *node) { be_union *bu = - this->ctx_->be_node_as_union (); + be_union::narrow_from_decl (this->ctx_->node ()); be_type *bt = 0; if (this->ctx_->alias ()) @@ -134,7 +130,7 @@ be_visitor_union_discriminant_ci::visit_predefined_type ( ) { be_union *bu = - this->ctx_->be_node_as_union (); + be_union::narrow_from_decl (this->ctx_->node ()); be_type *bt = 0; diff --git a/TAO/TAO_IDL/be/be_visitor_union/discriminant_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/discriminant_cs.cpp index cd5170d0c32..fbdb9404004 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/discriminant_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/discriminant_cs.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_union, - discriminant_cs, - "$Id$") - // ************************************************************************* // Visitor for discriminant in client stubs. // ************************************************************************* @@ -41,7 +37,7 @@ int be_visitor_union_discriminant_cs::visit_enum (be_enum *node) { be_union *bu = - this->ctx_->be_node_as_union (); // get the enclosing union backend + be_union::narrow_from_decl (this->ctx_->node ()); be_type *bt = 0; if (this->ctx_->alias ()) diff --git a/TAO/TAO_IDL/be/be_visitor_union/serializer_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union/serializer_op_ch.cpp index 4fcef2945ff..a76e2c7a2ac 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/serializer_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/serializer_op_ch.cpp @@ -19,10 +19,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_union, - serializer_op_ch, - "$Id$") - // *************************************************************************** // Union visitor for generating Serializer operator declarations in the client header // *************************************************************************** diff --git a/TAO/TAO_IDL/be/be_visitor_union/serializer_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/serializer_op_cs.cpp index 9befe5a698c..d765f96006a 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/serializer_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/serializer_op_cs.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_union, - serializer_op_cs, - "$Id$") - // *************************************************************************** // Union visitor for generating Serializer operator declarations in the client // stubs file diff --git a/TAO/TAO_IDL/be/be_visitor_union/union.cpp b/TAO/TAO_IDL/be/be_visitor_union/union.cpp index 30868bae313..d4527963873 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/union.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/union.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_union, - union, - "$Id$") - be_visitor_union::be_visitor_union (be_visitor_context *ctx) : be_visitor_scope (ctx) { 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 d8969b0bc9c..d6ae78181f7 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/union_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/union_ch.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_union, - union_ch, - "$Id$") - // ****************************************************** // For client header. // ****************************************************** 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 e0d5784c355..b463a9dffa5 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/union_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/union_ci.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_union, - union_ci, - "$Id$") - // ****************************************************** // For client inline. // ****************************************************** 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 bab9c2a18ac..62b53f11762 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_union, - union_cs, - "$Id$") - // ****************************************************** // For client stubs. // ****************************************************** diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch.cpp index 0759cc2a9b4..ae4f186b6e7 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_branch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_branch.cpp @@ -57,6 +57,3 @@ #include "be_visitor_union_branch/serializer_op_ch.cpp" #include "be_visitor_union_branch/serializer_op_cs.cpp" -ACE_RCSID (be, - be_visitor_union_branch, - "$Id$") diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_ch.cpp index 12020e54074..e111b253937 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_ch.cpp @@ -19,10 +19,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_union_branch, - cdr_op_ch, - "$Id$") - // ********************************************** // Visitor for union_branch in the client header file. // ********************************************** diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp index 5552336939d..98af2ab7098 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp @@ -85,9 +85,10 @@ be_visitor_union_branch_cdr_op_cs::visit_array (be_array *node) TAO_OutStream *os = this->ctx_->stream (); // Retrieve the union_branch node. - be_union_branch *f = this->ctx_->be_node_as_union_branch (); + be_union_branch *f = + be_union_branch::narrow_from_decl (this->ctx_->node ()); - if (!f) + if (f == 0) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_cdr_op_cs::" @@ -184,9 +185,10 @@ be_visitor_union_branch_cdr_op_cs::visit_enum (be_enum *node) TAO_OutStream *os = this->ctx_->stream (); // Retrieve the union_branch node - be_union_branch *f = this->ctx_->be_node_as_union_branch (); + be_union_branch *f = + be_union_branch::narrow_from_decl (this->ctx_->node ()); - if (!f) + if (f == 0) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_cdr_op_cs::" @@ -258,9 +260,10 @@ be_visitor_union_branch_cdr_op_cs::visit_interface (be_interface *node) TAO_OutStream *os = this->ctx_->stream (); // Retrieve the union_branch node. - be_union_branch *f = this->ctx_->be_node_as_union_branch (); + be_union_branch *f = + be_union_branch::narrow_from_decl (this->ctx_->node ()); - if (!f) + if (f == 0) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_cdr_op_cs::" @@ -337,9 +340,10 @@ be_visitor_union_branch_cdr_op_cs::visit_interface_fwd (be_interface_fwd *node) TAO_OutStream *os = this->ctx_->stream (); // Retrieve the union_branch node. - be_union_branch *f = this->ctx_->be_node_as_union_branch (); + be_union_branch *f = + be_union_branch::narrow_from_decl (this->ctx_->node ()); - if (!f) + if (f == 0) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_cdr_op_cs::" @@ -421,9 +425,10 @@ be_visitor_union_branch_cdr_op_cs::emit_valuetype_common (be_type *node) TAO_OutStream *os = this->ctx_->stream (); // Retrieve the union_branch node. - be_union_branch *f = this->ctx_->be_node_as_union_branch (); + be_union_branch *f = + be_union_branch::narrow_from_decl (this->ctx_->node ()); - if (!f) + if (f == 0) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_cdr_op_cs::" @@ -478,9 +483,10 @@ be_visitor_union_branch_cdr_op_cs::visit_predefined_type ( TAO_OutStream *os = this->ctx_->stream (); // Retrieve the union_branch node. - be_union_branch *f = this->ctx_->be_node_as_union_branch (); + be_union_branch *f = + be_union_branch::narrow_from_decl (this->ctx_->node ()); - if (!f) + if (f == 0) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_cdr_op_cs::" @@ -665,8 +671,10 @@ be_visitor_union_branch_cdr_op_cs::visit_sequence (be_sequence *node) TAO_OutStream *os = this->ctx_->stream (); // Retrieve the union_branch node. - be_union_branch *f = this->ctx_->be_node_as_union_branch (); - if (!f) + be_union_branch *f = + be_union_branch::narrow_from_decl (this->ctx_->node ()); + + if (f == 0) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_cdr_op_ci::" @@ -733,9 +741,10 @@ be_visitor_union_branch_cdr_op_cs::visit_string (be_string *node) TAO_OutStream *os = this->ctx_->stream (); // Retrieve the union_branch node. - be_union_branch *f = this->ctx_->be_node_as_union_branch (); + be_union_branch *f = + be_union_branch::narrow_from_decl (this->ctx_->node ()); - if (!f) + if (f == 0) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_cdr_op_ci::" @@ -855,9 +864,10 @@ be_visitor_union_branch_cdr_op_cs::visit_structure (be_structure *node) TAO_OutStream *os = this->ctx_->stream (); // Retrieve the union_branch node. - be_union_branch *f = this->ctx_->be_node_as_union_branch (); + be_union_branch *f = + be_union_branch::narrow_from_decl (this->ctx_->node ()); - if (!f) + if (f == 0) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_cdr_op_ci::" @@ -951,9 +961,10 @@ be_visitor_union_branch_cdr_op_cs::visit_union (be_union *node) TAO_OutStream *os = this->ctx_->stream (); // Retrieve the union_branch node. - be_union_branch *f = this->ctx_->be_node_as_union_branch (); + be_union_branch *f = + be_union_branch::narrow_from_decl (this->ctx_->node ()); - if (!f) + if (f == 0) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_cdr_op_ci::" diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/private_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/private_ch.cpp index 1ee945e8433..c248be13e49 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_branch/private_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_branch/private_ch.cpp @@ -19,10 +19,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_union_branch, - private_ch, - "$Id$") - // ********************************************** // visitor for union_branch in the client header generating the private information // ********************************************** 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 b2c29d4029a..5dc278ff99e 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 @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_union_branch, - public_assign_cs, - "$Id$") - // ********************************************** // visitor for union_branch in the client stubs file generating the code for // the copy ctor and assignment operator @@ -109,9 +105,9 @@ int be_visitor_union_branch_public_assign_cs::visit_array (be_array *node) { be_union_branch *ub = - this->ctx_->be_node_as_union_branch (); // get union branch + be_union_branch::narrow_from_decl (this->ctx_->node ()); be_union *bu = - this->ctx_->be_scope_as_union (); // get the enclosing union backend + be_union::narrow_from_scope (this->ctx_->scope ()); be_type *bt = 0; // Check if we are visiting this node via a visit to a typedef node. @@ -181,11 +177,11 @@ int be_visitor_union_branch_public_assign_cs::visit_enum (be_enum *) { be_union_branch *ub = - this->ctx_->be_node_as_union_branch (); // get union branch + be_union_branch::narrow_from_decl (this->ctx_->node ()); be_union *bu = - this->ctx_->be_scope_as_union (); // get the enclosing union backend + be_union::narrow_from_scope (this->ctx_->scope ()); - if (!ub || !bu) + if (ub == 0 || bu == 0) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_public_assign_cs::" @@ -209,9 +205,9 @@ int be_visitor_union_branch_public_assign_cs::visit_interface (be_interface *node) { be_union_branch *ub = - this->ctx_->be_node_as_union_branch (); // get union branch + be_union_branch::narrow_from_decl (this->ctx_->node ()); be_union *bu = - this->ctx_->be_scope_as_union (); // get the enclosing union backend + be_union::narrow_from_scope (this->ctx_->scope ()); be_type *bt = 0; // Check if we are visiting this node via a visit to a typedef node. @@ -306,9 +302,9 @@ be_visitor_union_branch_public_assign_cs::visit_interface_fwd ( ) { be_union_branch *ub = - this->ctx_->be_node_as_union_branch (); // get union branch + be_union_branch::narrow_from_decl (this->ctx_->node ()); be_union *bu = - this->ctx_->be_scope_as_union (); // get the enclosing union backend + be_union::narrow_from_scope (this->ctx_->scope ()); be_type *bt = 0; // Check if we are visiting this node via a visit to a typedef node. @@ -421,9 +417,9 @@ int be_visitor_union_branch_public_assign_cs::emit_valuetype_common (be_type *node) { be_union_branch *ub = - this->ctx_->be_node_as_union_branch (); // get union branch + be_union_branch::narrow_from_decl (this->ctx_->node ()); be_union *bu = - this->ctx_->be_scope_as_union (); // get the enclosing union backend + be_union::narrow_from_scope (this->ctx_->scope ()); be_type *bt = 0; // Check if we are visiting this node via a visit to a typedef node. @@ -491,9 +487,9 @@ be_visitor_union_branch_public_assign_cs::visit_predefined_type ( ) { be_union_branch *ub = - this->ctx_->be_node_as_union_branch (); // get union branch + be_union_branch::narrow_from_decl (this->ctx_->node ()); be_union *bu = - this->ctx_->be_scope_as_union (); // get the enclosing union backend + be_union::narrow_from_scope (this->ctx_->scope ()); be_type *bt = 0; // Check if we are visiting this node via a visit to a typedef node. @@ -603,9 +599,9 @@ int be_visitor_union_branch_public_assign_cs::visit_sequence (be_sequence *node) { be_union_branch *ub = - this->ctx_->be_node_as_union_branch (); // get union branch + be_union_branch::narrow_from_decl (this->ctx_->node ()); be_union *bu = - this->ctx_->be_scope_as_union (); // get the enclosing union backend + be_union::narrow_from_scope (this->ctx_->scope ()); be_type *bt = 0; // Check if we are visiting this node via a visit to a typedef node. @@ -668,11 +664,11 @@ int be_visitor_union_branch_public_assign_cs::visit_string (be_string *node) { be_union_branch *ub = - this->ctx_->be_node_as_union_branch (); // get union branch + be_union_branch::narrow_from_decl (this->ctx_->node ()); be_union *bu = - this->ctx_->be_scope_as_union (); // get the enclosing union backend + be_union::narrow_from_scope (this->ctx_->scope ()); - if (!ub || !bu) + if (ub == 0 || bu == 0) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_public_assign_cs::" @@ -704,9 +700,9 @@ int be_visitor_union_branch_public_assign_cs::visit_structure (be_structure *node) { be_union_branch *ub = - this->ctx_->be_node_as_union_branch (); // get union branch + be_union_branch::narrow_from_decl (this->ctx_->node ()); be_union *bu = - this->ctx_->be_scope_as_union (); // get the enclosing union backend + be_union::narrow_from_scope (this->ctx_->scope ()); be_type *bt = 0; // Check if we are visiting this node via a visit to a typedef node. @@ -799,9 +795,9 @@ int be_visitor_union_branch_public_assign_cs::visit_union (be_union *node) { be_union_branch *ub = - this->ctx_->be_node_as_union_branch (); // get union branch + be_union_branch::narrow_from_decl (this->ctx_->node ()); be_union *bu = - this->ctx_->be_scope_as_union (); // get the enclosing union backend + be_union::narrow_from_scope (this->ctx_->scope ()); be_type *bt = 0; // Check if we are visiting this node via a visit to a typedef node. diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp index dcf1c10d539..cbfaf91ef3a 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_union_branch, - public_ch, - "$Id$") - // ********************************************** // Visitor for union_branch in the client header file. // ********************************************** 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 4f34840fb76..665194bd685 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 @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_union_branch, - public_ci, - "$Id$") - // ***************************************************** // Visitor for union_branch in the client inline file. // ***************************************************** @@ -73,8 +69,10 @@ be_visitor_union_branch_public_ci::visit_union_branch (be_union_branch *node) int be_visitor_union_branch_public_ci::visit_array (be_array *node) { - be_union_branch *ub = this->ctx_->be_node_as_union_branch (); - be_union *bu = this->ctx_->be_scope_as_union (); + be_union_branch *ub = + be_union_branch::narrow_from_decl (this->ctx_->node ()); + be_union *bu = + be_union::narrow_from_scope (this->ctx_->scope ()); be_type *bt = 0; // Check if we are visiting this node via a visit to a typedef node. @@ -206,8 +204,10 @@ be_visitor_union_branch_public_ci::visit_array (be_array *node) int be_visitor_union_branch_public_ci::visit_enum (be_enum *node) { - be_union_branch *ub = this->ctx_->be_node_as_union_branch (); - be_union *bu = this->ctx_->be_scope_as_union (); + be_union_branch *ub = + be_union_branch::narrow_from_decl (this->ctx_->node ()); + be_union *bu = + be_union::narrow_from_scope (this->ctx_->scope ()); be_type *bt = 0; // heck if we are visiting this node via a visit to a typedef node. @@ -275,8 +275,10 @@ be_visitor_union_branch_public_ci::visit_enum (be_enum *node) int be_visitor_union_branch_public_ci::visit_interface (be_interface *node) { - be_union_branch *ub = this->ctx_->be_node_as_union_branch (); - be_union *bu = this->ctx_->be_scope_as_union (); + be_union_branch *ub = + be_union_branch::narrow_from_decl (this->ctx_->node ()); + be_union *bu = + be_union::narrow_from_scope (this->ctx_->scope ()); be_type *bt = 0; // Check if we are visiting this node via a visit to a typedef node. @@ -363,8 +365,10 @@ be_visitor_union_branch_public_ci::visit_interface (be_interface *node) int be_visitor_union_branch_public_ci::visit_interface_fwd (be_interface_fwd *node) { - be_union_branch *ub = this->ctx_->be_node_as_union_branch (); - be_union *bu = this->ctx_->be_scope_as_union (); + be_union_branch *ub = + be_union_branch::narrow_from_decl (this->ctx_->node ()); + be_union *bu = + be_union::narrow_from_scope (this->ctx_->scope ()); be_type *bt = 0; // Check if we are visiting this node via a visit to a typedef node. @@ -469,8 +473,10 @@ be_visitor_union_branch_public_ci::visit_valuetype_fwd (be_valuetype_fwd *node) int be_visitor_union_branch_public_ci::emit_valuetype_common (be_type *node) { - be_union_branch *ub = this->ctx_->be_node_as_union_branch (); - be_union *bu = this->ctx_->be_scope_as_union (); + be_union_branch *ub = + be_union_branch::narrow_from_decl (this->ctx_->node ()); + be_union *bu = + be_union::narrow_from_scope (this->ctx_->scope ()); be_type *bt = 0; // Check if we are visiting this node via a visit to a typedef node. @@ -546,8 +552,10 @@ be_visitor_union_branch_public_ci::visit_predefined_type ( be_predefined_type *node ) { - be_union_branch *ub = this->ctx_->be_node_as_union_branch (); - be_union *bu = this->ctx_->be_scope_as_union (); + be_union_branch *ub = + be_union_branch::narrow_from_decl (this->ctx_->node ()); + be_union *bu = + be_union::narrow_from_scope (this->ctx_->scope ()); be_type *bt = 0; // Check if we are visiting this node via a visit to a typedef node. @@ -756,8 +764,10 @@ be_visitor_union_branch_public_ci::visit_predefined_type ( int be_visitor_union_branch_public_ci::visit_sequence (be_sequence *node) { - be_union_branch *ub = this->ctx_->be_node_as_union_branch (); - be_union *bu = this->ctx_->be_scope_as_union (); + be_union_branch *ub = + be_union_branch::narrow_from_decl (this->ctx_->node ()); + be_union *bu = + be_union::narrow_from_scope (this->ctx_->scope ()); be_type *bt = 0; // Check if we are visiting this node via a visit to a typedef node. @@ -836,10 +846,12 @@ be_visitor_union_branch_public_ci::visit_sequence (be_sequence *node) int be_visitor_union_branch_public_ci::visit_string (be_string *node) { - be_union_branch *ub = this->ctx_->be_node_as_union_branch (); - be_union *bu = this->ctx_->be_scope_as_union (); + be_union_branch *ub = + be_union_branch::narrow_from_decl (this->ctx_->node ()); + be_union *bu = + be_union::narrow_from_scope (this->ctx_->scope ()); - if (!ub || !bu) + if (ub == 0 || bu == 0) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_public_ci::" @@ -1005,8 +1017,10 @@ be_visitor_union_branch_public_ci::visit_string (be_string *node) int be_visitor_union_branch_public_ci::visit_structure (be_structure *node) { - be_union_branch *ub = this->ctx_->be_node_as_union_branch (); - be_union *bu = this->ctx_->be_scope_as_union (); + be_union_branch *ub = + be_union_branch::narrow_from_decl (this->ctx_->node ()); + be_union *bu = + be_union::narrow_from_scope (this->ctx_->scope ()); be_type *bt = 0; // Check if we are visiting this node via a visit to a typedef node. @@ -1161,8 +1175,10 @@ be_visitor_union_branch_public_ci::visit_typedef (be_typedef *node) int be_visitor_union_branch_public_ci::visit_union (be_union *node) { - be_union_branch *ub = this->ctx_->be_node_as_union_branch (); - be_union *bu = this->ctx_->be_scope_as_union (); + be_union_branch *ub = + be_union_branch::narrow_from_decl (this->ctx_->node ()); + be_union *bu = + be_union::narrow_from_scope (this->ctx_->scope ()); be_type *bt = 0; // Check if we are visiting this node via a visit to a typedef node. diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_constructor_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_constructor_cs.cpp index ba09ab2867a..41ae6c36397 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_constructor_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_constructor_cs.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_union_branch, - public_constructor_cs, - "$Id$") - // ********************************************** // visitor for union_branch in the client stubs file generating the code for // the copy ctor and assignment operator @@ -77,9 +73,9 @@ int be_visitor_union_branch_public_constructor_cs::visit_array (be_array *node) { be_union_branch *ub = - this->ctx_->be_node_as_union_branch (); // get union branch + be_union_branch::narrow_from_decl (this->ctx_->node ()); be_union *bu = - this->ctx_->be_scope_as_union (); // get the enclosing union backend + be_union::narrow_from_scope (this->ctx_->scope ()); be_type *bt = 0; // Check if we are visiting this node via a visit to a typedef node. @@ -149,9 +145,9 @@ be_visitor_union_branch_public_constructor_cs::visit_predefined_type ( ) { be_union_branch *ub = - this->ctx_->be_node_as_union_branch (); // get union branch + be_union_branch::narrow_from_decl (this->ctx_->node ()); be_union *bu = - this->ctx_->be_scope_as_union (); // get the enclosing union backend + be_union::narrow_from_scope (this->ctx_->scope ()); be_type *bt = 0; // Check if we are visiting this node via a visit to a typedef node. @@ -195,9 +191,9 @@ int be_visitor_union_branch_public_constructor_cs::visit_sequence (be_sequence *node) { be_union_branch *ub = - this->ctx_->be_node_as_union_branch (); // get union branch + be_union_branch::narrow_from_decl (this->ctx_->node ()); be_union *bu = - this->ctx_->be_scope_as_union (); // get the enclosing union backend + be_union::narrow_from_scope (this->ctx_->scope ()); be_type *bt = 0; // Check if we are visiting this node via a visit to a typedef node. @@ -232,9 +228,9 @@ int be_visitor_union_branch_public_constructor_cs::visit_structure (be_structure *node) { be_union_branch *ub = - this->ctx_->be_node_as_union_branch (); // get union branch + be_union_branch::narrow_from_decl (this->ctx_->node ()); be_union *bu = - this->ctx_->be_scope_as_union (); // get the enclosing union backend + be_union::narrow_from_scope (this->ctx_->scope ()); be_type *bt = 0; // Check if we are visiting this node via a visit to a typedef node. @@ -294,9 +290,9 @@ int be_visitor_union_branch_public_constructor_cs::visit_union (be_union *node) { be_union_branch *ub = - this->ctx_->be_node_as_union_branch (); // get union branch + be_union_branch::narrow_from_decl (this->ctx_->node ()); be_union *bu = - this->ctx_->be_scope_as_union (); // get the enclosing union backend + be_union::narrow_from_scope (this->ctx_->scope ()); be_type *bt = 0; // Check if we are visiting this node via a visit to a typedef node. diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_cs.cpp index 03b2f21402d..8fb0f663467 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_cs.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_union_branch, - public_cs, - "$Id$") - // ********************************************** // Visitor for union_branch in the client stubs file. // ********************************************** diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp index c29b1a933ac..33e028d43c5 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_union_branch, - public_reset_cs, - "$Id$") - // ***************************************************** // visitor for union_branch in the client // stubs file for the reset method @@ -94,9 +90,9 @@ int be_visitor_union_branch_public_reset_cs::visit_array (be_array *node) { be_union_branch *ub = - this->ctx_->be_node_as_union_branch (); + be_union_branch::narrow_from_decl (this->ctx_->node ()); be_union *bu = - this->ctx_->be_scope_as_union (); + be_union::narrow_from_scope (this->ctx_->scope ()); be_type *bt = 0; if (this->ctx_->alias ()) @@ -108,7 +104,7 @@ be_visitor_union_branch_public_reset_cs::visit_array (be_array *node) bt = node; } - if (!ub || !bu) + if (ub == 0 || bu == 0) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_public_reset_cs::" @@ -164,11 +160,11 @@ int be_visitor_union_branch_public_reset_cs::visit_enum (be_enum *) { be_union_branch *ub = - this->ctx_->be_node_as_union_branch (); + be_union_branch::narrow_from_decl (this->ctx_->node ()); be_union *bu = - this->ctx_->be_scope_as_union (); + be_union::narrow_from_scope (this->ctx_->scope ()); - if (!ub || !bu) + if (ub == 0 || bu == 0) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_public_reset_cs::" @@ -187,11 +183,11 @@ int be_visitor_union_branch_public_reset_cs::visit_interface (be_interface *) { be_union_branch *ub = - this->ctx_->be_node_as_union_branch (); + be_union_branch::narrow_from_decl (this->ctx_->node ()); be_union *bu = - this->ctx_->be_scope_as_union (); + be_union::narrow_from_scope (this->ctx_->scope ()); - if (!ub || !bu) + if (ub == 0 || bu == 0) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_public_reset_cs::" @@ -215,11 +211,11 @@ int be_visitor_union_branch_public_reset_cs::visit_interface_fwd (be_interface_fwd *) { be_union_branch *ub = - this->ctx_->be_node_as_union_branch (); + be_union_branch::narrow_from_decl (this->ctx_->node ()); be_union *bu = - this->ctx_->be_scope_as_union (); + be_union::narrow_from_scope (this->ctx_->scope ()); - if (!ub || !bu) + if (ub == 0 || bu == 0) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_public_reset_cs::" @@ -240,14 +236,15 @@ be_visitor_union_branch_public_reset_cs::visit_interface_fwd (be_interface_fwd * } int -be_visitor_union_branch_public_reset_cs::visit_valuebox (be_valuebox *) +be_visitor_union_branch_public_reset_cs::visit_valuebox ( + be_valuebox *) { be_union_branch *ub = - this->ctx_->be_node_as_union_branch (); + be_union_branch::narrow_from_decl (this->ctx_->node ()); be_union *bu = - this->ctx_->be_scope_as_union (); + be_union::narrow_from_scope (this->ctx_->scope ()); - if (!ub || !bu) + if (ub == 0 || bu == 0) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_public_reset_cs::" @@ -268,14 +265,15 @@ be_visitor_union_branch_public_reset_cs::visit_valuebox (be_valuebox *) } int -be_visitor_union_branch_public_reset_cs::visit_valuetype (be_valuetype *) +be_visitor_union_branch_public_reset_cs::visit_valuetype ( + be_valuetype *) { be_union_branch *ub = - this->ctx_->be_node_as_union_branch (); + be_union_branch::narrow_from_decl (this->ctx_->node ()); be_union *bu = - this->ctx_->be_scope_as_union (); + be_union::narrow_from_scope (this->ctx_->scope ()); - if (!ub || !bu) + if (ub == 0 || bu == 0) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_public_reset_cs::" @@ -296,14 +294,15 @@ be_visitor_union_branch_public_reset_cs::visit_valuetype (be_valuetype *) } int -be_visitor_union_branch_public_reset_cs::visit_valuetype_fwd (be_valuetype_fwd *) +be_visitor_union_branch_public_reset_cs::visit_valuetype_fwd ( + be_valuetype_fwd *) { be_union_branch *ub = - this->ctx_->be_node_as_union_branch (); + be_union_branch::narrow_from_decl (this->ctx_->node ()); be_union *bu = - this->ctx_->be_scope_as_union (); + be_union::narrow_from_scope (this->ctx_->scope ()); - if (!ub || !bu) + if (ub == 0 || bu == 0) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_public_reset_cs::" @@ -329,11 +328,11 @@ be_visitor_union_branch_public_reset_cs::visit_predefined_type ( ) { be_union_branch *ub = - this->ctx_->be_node_as_union_branch (); + be_union_branch::narrow_from_decl (this->ctx_->node ()); be_union *bu = - this->ctx_->be_scope_as_union (); + be_union::narrow_from_scope (this->ctx_->scope ()); - if (!ub || !bu) + if (ub == 0 || bu == 0) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_public_reset_cs::" @@ -382,14 +381,15 @@ be_visitor_union_branch_public_reset_cs::visit_predefined_type ( } int -be_visitor_union_branch_public_reset_cs::visit_sequence (be_sequence *) +be_visitor_union_branch_public_reset_cs::visit_sequence ( + be_sequence *) { be_union_branch *ub = - this->ctx_->be_node_as_union_branch (); + be_union_branch::narrow_from_decl (this->ctx_->node ()); be_union *bu = - this->ctx_->be_scope_as_union (); + be_union::narrow_from_scope (this->ctx_->scope ()); - if (!ub || !bu) + if (ub == 0 || bu == 0) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_public_reset_cs::" @@ -411,14 +411,15 @@ be_visitor_union_branch_public_reset_cs::visit_sequence (be_sequence *) } int -be_visitor_union_branch_public_reset_cs::visit_string (be_string *node) +be_visitor_union_branch_public_reset_cs::visit_string ( + be_string *node) { be_union_branch *ub = - this->ctx_->be_node_as_union_branch (); + be_union_branch::narrow_from_decl (this->ctx_->node ()); be_union *bu = - this->ctx_->be_scope_as_union (); + be_union::narrow_from_scope (this->ctx_->scope ()); - if (!ub || !bu) + if (ub == 0 || bu == 0) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_public_reset_cs::" @@ -448,12 +449,13 @@ be_visitor_union_branch_public_reset_cs::visit_string (be_string *node) } int -be_visitor_union_branch_public_reset_cs::visit_structure (be_structure *node) +be_visitor_union_branch_public_reset_cs::visit_structure ( + be_structure *node) { be_union_branch *ub = - this->ctx_->be_node_as_union_branch (); + be_union_branch::narrow_from_decl (this->ctx_->node ()); be_union *bu = - this->ctx_->be_scope_as_union (); + be_union::narrow_from_scope (this->ctx_->scope ()); be_type *bt = 0; if (this->ctx_->alias ()) @@ -465,7 +467,7 @@ be_visitor_union_branch_public_reset_cs::visit_structure (be_structure *node) bt = node; } - if (!ub || !bu) + if (ub == 0 || bu == 0) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_public_reset_cs::" @@ -513,14 +515,15 @@ be_visitor_union_branch_public_reset_cs::visit_typedef (be_typedef *node) } int -be_visitor_union_branch_public_reset_cs::visit_union (be_union *) +be_visitor_union_branch_public_reset_cs::visit_union ( + be_union *) { be_union_branch *ub = - this->ctx_->be_node_as_union_branch (); + be_union_branch::narrow_from_decl (this->ctx_->node ()); be_union *bu = - this->ctx_->be_scope_as_union (); + be_union::narrow_from_scope (this->ctx_->scope ()); - if (!ub || !bu) + if (ub == 0 || bu == 0) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_public_reset_cs::" diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/serializer_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/serializer_op_ch.cpp index 7e4b2cd0929..b690fa313e3 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_branch/serializer_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_branch/serializer_op_ch.cpp @@ -20,10 +20,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_union_branch, - serializer_op_ch, - "$Id$") - // ********************************************** // Visitor for union_branch in the client header file. // ********************************************** diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/serializer_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/serializer_op_cs.cpp index c07b2b5b8e9..ba3ba3525e0 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_branch/serializer_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_branch/serializer_op_cs.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_union_branch, - serializer_op_cs, - "$Id$") - // ********************************************** // Visitor for union_branch in the client stubs file. // ********************************************** @@ -89,9 +85,10 @@ be_visitor_union_branch_serializer_op_cs::visit_array (be_array *node) TAO_OutStream *os = this->ctx_->stream (); // Retrieve the union_branch node. - be_union_branch *f = this->ctx_->be_node_as_union_branch (); + be_union_branch *f = + be_union_branch::narrow_from_decl (this->ctx_->node ()); - if (!f) + if (f == 0) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_serializer_op_cs::" @@ -229,9 +226,10 @@ be_visitor_union_branch_serializer_op_cs::visit_enum (be_enum *node) TAO_OutStream *os = this->ctx_->stream (); // Retrieve the union_branch node - be_union_branch *f = this->ctx_->be_node_as_union_branch (); + be_union_branch *f = + be_union_branch::narrow_from_decl (this->ctx_->node ()); - if (!f) + if (f == 0) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_serializer_op_cs::" @@ -328,9 +326,10 @@ be_visitor_union_branch_serializer_op_cs::visit_interface (be_interface *node) TAO_OutStream *os = this->ctx_->stream (); // Retrieve the union_branch node. - be_union_branch *f = this->ctx_->be_node_as_union_branch (); + be_union_branch *f = + be_union_branch::narrow_from_decl (this->ctx_->node ()); - if (!f) + if (f == 0) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_serializer_op_cs::" @@ -413,9 +412,10 @@ be_visitor_union_branch_serializer_op_cs::visit_interface_fwd (be_interface_fwd TAO_OutStream *os = this->ctx_->stream (); // Retrieve the union_branch node. - be_union_branch *f = this->ctx_->be_node_as_union_branch (); + be_union_branch *f = + be_union_branch::narrow_from_decl (this->ctx_->node ()); - if (!f) + if (f == 0) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_serializer_op_cs::" @@ -475,9 +475,10 @@ be_visitor_union_branch_serializer_op_cs::visit_valuetype (be_valuetype *node) TAO_OutStream *os = this->ctx_->stream (); // Retrieve the union_branch node. - be_union_branch *f = this->ctx_->be_node_as_union_branch (); + be_union_branch *f = + be_union_branch::narrow_from_decl (this->ctx_->node ()); - if (!f) + if (f == 0) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_serializer_op_cs::" @@ -530,9 +531,10 @@ be_visitor_union_branch_serializer_op_cs::visit_valuetype_fwd (be_valuetype_fwd TAO_OutStream *os = this->ctx_->stream (); // Retrieve the union_branch node. - be_union_branch *f = this->ctx_->be_node_as_union_branch (); + be_union_branch *f = + be_union_branch::narrow_from_decl (this->ctx_->node ()); - if (!f) + if (f == 0) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_serializer_op_cs::" @@ -585,9 +587,10 @@ be_visitor_union_branch_serializer_op_cs::visit_predefined_type (be_predefined_t TAO_OutStream *os = this->ctx_->stream (); // Retrieve the union_branch node. - be_union_branch *f = this->ctx_->be_node_as_union_branch (); + be_union_branch *f = + be_union_branch::narrow_from_decl (this->ctx_->node ()); - if (!f) + if (f == 0) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_serializer_op_cs::" @@ -891,8 +894,10 @@ be_visitor_union_branch_serializer_op_cs::visit_sequence (be_sequence *node) TAO_OutStream *os = this->ctx_->stream (); // Retrieve the union_branch node. - be_union_branch *f = this->ctx_->be_node_as_union_branch (); - if (!f) + be_union_branch *f = + be_union_branch::narrow_from_decl (this->ctx_->node ()); + + if (f == 0) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_serializer_op_cs::" @@ -996,9 +1001,10 @@ be_visitor_union_branch_serializer_op_cs::visit_string (be_string *node) TAO_OutStream *os = this->ctx_->stream (); // Retrieve the union_branch node. - be_union_branch *f = this->ctx_->be_node_as_union_branch (); + be_union_branch *f = + be_union_branch::narrow_from_decl (this->ctx_->node ()); - if (!f) + if (f == 0) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_serializer_op_cs::" @@ -1106,9 +1112,10 @@ be_visitor_union_branch_serializer_op_cs::visit_structure (be_structure *node) TAO_OutStream *os = this->ctx_->stream (); // Retrieve the union_branch node. - be_union_branch *f = this->ctx_->be_node_as_union_branch (); + be_union_branch *f = + be_union_branch::narrow_from_decl (this->ctx_->node ()); - if (!f) + if (f == 0) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_serializer_op_cs::" @@ -1239,9 +1246,10 @@ be_visitor_union_branch_serializer_op_cs::visit_union (be_union *node) TAO_OutStream *os = this->ctx_->stream (); // Retrieve the union_branch node. - be_union_branch *f = this->ctx_->be_node_as_union_branch (); + be_union_branch *f = + be_union_branch::narrow_from_decl (this->ctx_->node ()); - if (!f) + if (f == 0) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_serializer_op_cs::" diff --git a/TAO/TAO_IDL/be/be_visitor_union_fwd.cpp b/TAO/TAO_IDL/be/be_visitor_union_fwd.cpp index e50944b28e9..353a8212c01 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_fwd.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_fwd.cpp @@ -27,6 +27,3 @@ #include "be_visitor_union_fwd/union_fwd_ch.cpp" -ACE_RCSID (be, - be_visitor_union_fwd, - "$Id$") 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 a589e8eb0c4..420b1b8abbc 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 @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_union_fwd, - union_fwd_ch, - "$Id$") - be_visitor_union_fwd_ch::be_visitor_union_fwd_ch ( be_visitor_context *ctx ) diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_ch.cpp index e763f9917c9..e69684cb52e 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_ch.cpp @@ -19,10 +19,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_valuebox, - any_op_ch, - "$Id$") - // *************************************************************************** // Valuebox visitor for generating Any operator declarations. // *************************************************************************** diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp index 640572ba84c..3b6777b0c15 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp @@ -17,11 +17,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_valuebox, - any_op_cs, - "$Id$") - - // *************************************************************************** // Valuebox visitor for generating Any operator declarations in the client // stubs file diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_ch.cpp index cd35ccf737b..c2bee3c5365 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_ch.cpp @@ -19,10 +19,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_valuebox, - cdr_op_ch, - "$Id$") - be_visitor_valuebox_cdr_op_ch::be_visitor_valuebox_cdr_op_ch ( be_visitor_context *ctx ) 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 42b42489d69..cec86d8648b 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 @@ -19,10 +19,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_valuebox, - cdr_op_cs, - "$Id$") - be_visitor_valuebox_cdr_op_cs::be_visitor_valuebox_cdr_op_cs ( be_visitor_context *ctx ) diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/field_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/field_ch.cpp index cf6aff77ea0..711475550a3 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/field_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/field_ch.cpp @@ -25,11 +25,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_valuebox, - field_ch, - "$Id$") - - be_visitor_valuebox_field_ch::be_visitor_valuebox_field_ch ( be_visitor_context *ctx ) diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox.cpp index e114bb204e2..885e21eda5f 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_valuebox, - valuebox, - "$Id$") - be_visitor_valuebox::be_visitor_valuebox (be_visitor_context *ctx) : be_visitor_decl (ctx) { 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 9ddf2dc2fd2..212b5b9f69f 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_valuebox, - valuebox_ch, - "$Id: valuebox_ch.cpp Exp") - // ****************************************************** // Valuebox visitor for client header // ****************************************************** 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 3dac932e255..f29e9215ee6 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_valuebox, - valuebox_ci, - "$Id: valuebox_ci.cpp Exp") - be_visitor_valuebox_ci::be_visitor_valuebox_ci (be_visitor_context *ctx) : be_visitor_valuebox (ctx) { 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 40e6920fc84..5f12f584215 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_valuebox, - valuebox_cs, - "$Id: valuebox_cs.cpp Exp") - be_visitor_valuebox_cs::be_visitor_valuebox_cs (be_visitor_context *ctx) : be_visitor_valuebox (ctx) { diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype.cpp index 2db4462bc35..ffc00aa1d31 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype.cpp @@ -99,6 +99,3 @@ #include "be_visitor_valuetype/valuetype_init_cs.cpp" #include "be_visitor_valuetype/valuetype_init_arglist_ch.cpp" -ACE_RCSID (be, - be_visitor_valuetype, - "$Id$") diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/ami_exception_holder_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/ami_exception_holder_ch.cpp index 84d1bd214c5..ec652a1fb7a 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/ami_exception_holder_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/ami_exception_holder_ch.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_valuetype, - ami_exception_holder_ch, - "$Id$") - // ****************************************************** // Interface visitor for client header. // ****************************************************** diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/ami_exception_holder_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/ami_exception_holder_cs.cpp index 726706a8ff1..c57bbe6366d 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/ami_exception_holder_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/ami_exception_holder_cs.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_valuetype, - ami_exception_holder_cs, - "$Id$") - // ************************************************************ // Interface visitor for client stubs // ************************************************************ diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp index 4d3b75db1e8..71e5aa65b8a 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp @@ -20,10 +20,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_valuetype, - any_op_ch, - "$Id$") - // *************************************************************************** // Valuetype visitor for generating Any operator declarations. // *************************************************************************** diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp index b4b74e060fa..b089c59dbd6 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp @@ -18,11 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_valuetype, - any_op_cs, - "$Id$") - - // *************************************************************************** // Valuetype visitor for generating Any operator declarations in the client // stubs file diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp index e9f799fa90c..bf8fac0eea1 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp @@ -20,10 +20,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_valuetype, - arglist, - "$Id$") - // ************************************************************ // Operation visitor to generate the argument list. // We have separated code generation for this from the 4 main @@ -132,9 +128,17 @@ be_visitor_obv_operation_arglist::visit_argument (be_argument *node) // defined. We need this since argument types may very well be declared // inside the scope of the interface node. In such cases, we would like to // generate the appropriate relative scoped names. - be_operation *op = this->ctx_->be_scope_as_operation (); + be_operation *op = + be_operation::narrow_from_decl (this->ctx_->node ()); - if (!op) + // Sometimes the operation is stored in the context scope instead. + if (op == 0) + { + op = + be_operation::narrow_from_scope (this->ctx_->scope ()); + } + + if (op == 0) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_arglist::" diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp index 9aa4141c06e..8e0a7530ec0 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp @@ -20,10 +20,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_valuetype, - cdr_op_ch, - "$Id$") - be_visitor_valuetype_cdr_op_ch::be_visitor_valuetype_cdr_op_ch ( be_visitor_context *ctx ) 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 74596766acf..ad32bbe1984 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 @@ -21,10 +21,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_valuetype, - valuetype_cdr_op_cs, - "$Id$") - be_visitor_valuetype_cdr_op_cs::be_visitor_valuetype_cdr_op_cs ( be_visitor_context *ctx ) diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_ch.cpp index e9e8b301630..10a992a4a7b 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_ch.cpp @@ -18,10 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_valuetype, - field_cdr_op_ch, - "$Id$") - // ********************************************** // Visitor for field in the client header file. // ********************************************** diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_cs.cpp index 7bd08a81d7a..efadfd137eb 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_cs.cpp @@ -19,10 +19,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_valuetype, - field_cdr_op_cs, - "$Id$") - // ********************************************** // Visitor for field in the client inline file. // ********************************************** @@ -74,9 +70,10 @@ be_visitor_valuetype_field_cdr_cs::visit_array (be_array *node) TAO_OutStream *os = this->ctx_->stream (); // Retrieve the field node. - be_field *f = this->ctx_->be_node_as_field (); + be_field *f = + be_field::narrow_from_decl (this->ctx_->node ()); - if (!f) + if (f == 0) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_valuetype_field_cdr_cs::" @@ -178,9 +175,10 @@ be_visitor_valuetype_field_cdr_cs::visit_enum (be_enum *node) TAO_OutStream *os = this->ctx_->stream (); // Retrieve the field node. - be_field *f = this->ctx_->be_node_as_field (); + be_field *f = + be_field::narrow_from_decl (this->ctx_->node ()); - if (!f) + if (f == 0) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_valuetype_field_cdr_cs::" @@ -239,9 +237,10 @@ be_visitor_valuetype_field_cdr_cs::visit_interface (be_interface *node) TAO_OutStream *os = this->ctx_->stream (); // Retrieve the field node. - be_field *f = this->ctx_->be_node_as_field (); + be_field *f = + be_field::narrow_from_decl (this->ctx_->node ()); - if (!f) + if (f == 0) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_valuetype_field_cdr_cs::" @@ -288,9 +287,10 @@ be_visitor_valuetype_field_cdr_cs::visit_interface_fwd (be_interface_fwd *node) TAO_OutStream *os = this->ctx_->stream (); // Retrieve the field node. - be_field *f = this->ctx_->be_node_as_field (); + be_field *f = + be_field::narrow_from_decl (this->ctx_->node ()); - if (!f) + if (f == 0) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_valuetype_field_cdr_cs::" @@ -343,9 +343,10 @@ be_visitor_valuetype_field_cdr_cs::valuetype_common (be_type *) TAO_OutStream *os = this->ctx_->stream (); // Retrieve the field node. - be_field *f = this->ctx_->be_node_as_field (); + be_field *f = + be_field::narrow_from_decl (this->ctx_->node ()); - if (!f) + if (f == 0) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_valuetype_field_cdr_cs::" @@ -394,9 +395,10 @@ be_visitor_valuetype_field_cdr_cs::visit_valuetype_fwd (be_valuetype_fwd *) TAO_OutStream *os = this->ctx_->stream (); // Retrieve the field node. - be_field *f = this->ctx_->be_node_as_field (); + be_field *f = + be_field::narrow_from_decl (this->ctx_->node ()); - if (!f) + if (f == 0) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_valuetype_field_cdr_cs::" @@ -463,9 +465,10 @@ be_visitor_valuetype_field_cdr_cs::visit_predefined_type (be_predefined_type *no TAO_OutStream *os = this->ctx_->stream (); // Retrieve the field node. - be_field *f = this->ctx_->be_node_as_field (); + be_field *f = + be_field::narrow_from_decl (this->ctx_->node ()); - if (!f) + if (f == 0) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_valuetype_field_cdr_cs::" @@ -567,9 +570,10 @@ be_visitor_valuetype_field_cdr_cs::visit_sequence (be_sequence *node) TAO_OutStream *os = this->ctx_->stream (); // Retrieve the field node. - be_field *f = this->ctx_->be_node_as_field (); + be_field *f = + be_field::narrow_from_decl (this->ctx_->node ()); - if (!f) + if (f == 0) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_valuetype_field_cdr_cs::" @@ -631,9 +635,10 @@ be_visitor_valuetype_field_cdr_cs::visit_string (be_string *str) TAO_OutStream *os = this->ctx_->stream (); // Retrieve the field node. - be_field *f = this->ctx_->be_node_as_field (); + be_field *f = + be_field::narrow_from_decl (this->ctx_->node ()); - if (!f) + if (f == 0) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_valuetype_field_cdr_cs::" @@ -706,14 +711,16 @@ be_visitor_valuetype_field_cdr_cs::visit_string (be_string *str) } int -be_visitor_valuetype_field_cdr_cs::visit_structure (be_structure *node) +be_visitor_valuetype_field_cdr_cs::visit_structure ( + be_structure *node) { TAO_OutStream *os = this->ctx_->stream (); // Retrieve the field node. - be_field *f = this->ctx_->be_node_as_field (); + be_field *f = + be_field::narrow_from_decl (this->ctx_->node ()); - if (!f) + if (f == 0) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_valuetype_field_cdr_cs::" @@ -793,9 +800,10 @@ be_visitor_valuetype_field_cdr_cs::visit_union (be_union *node) TAO_OutStream *os = this->ctx_->stream (); // Retrieve the field node. - be_field *f = this->ctx_->be_node_as_field (); + be_field *f = + be_field::narrow_from_decl (this->ctx_->node ()); - if (!f) + if (f == 0) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_valuetype_field_cdr_cs::" @@ -901,9 +909,10 @@ be_visitor_valuetype_field_cdr_decl::visit_array (be_array *node) TAO_OutStream *os = this->ctx_->stream (); // Retrieve the field node. - be_field *f = this->ctx_->be_node_as_field (); + be_field *f = + be_field::narrow_from_decl (this->ctx_->node ()); - if (!f) + if (f == 0) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_valuetype_field_cdr_decl::" diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp index a19f09c6660..3a7f5c128a7 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp @@ -20,10 +20,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_valuetype, - field_ch, - "$Id$") - be_visitor_valuetype_field_ch::be_visitor_valuetype_field_ch ( be_visitor_context *ctx ) diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/field_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/field_ci.cpp index b03f2f2b3f0..1d3d2b74ae2 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/field_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/field_ci.cpp @@ -20,10 +20,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_valuetype, - field_ci, - "$Id$") - be_visitor_valuetype_field_ci::be_visitor_valuetype_field_ci ( be_visitor_context *ctx ) diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp index 1f2a7442c8b..9f1984177b8 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp @@ -20,9 +20,6 @@ // derived from be_visitor_union_branch/public_ci.cpp // // ============================================================================ -ACE_RCSID (be_visitor_valuetype, - field_cs, - "$Id$") be_visitor_valuetype_field_cs::be_visitor_valuetype_field_cs ( be_visitor_context *ctx diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_ch.cpp index 55aec2de444..a046c00f482 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_ch.cpp @@ -20,10 +20,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_valuetype, - marshal_ch, - "$Id$") - // *************************************************************************** // Structure visitor for generating declarations // *************************************************************************** diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp index a317e67f4c4..b22a255251f 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp @@ -19,10 +19,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_valuetype, - marshal_cs, - "$Id$") - be_visitor_valuetype_marshal_cs::be_visitor_valuetype_marshal_cs ( be_visitor_context *ctx ) diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/obv_module.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/obv_module.cpp index c69154e3dce..5b6070698f2 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/obv_module.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/obv_module.cpp @@ -20,10 +20,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_obv_module, - obv_module, - "$Id$") - // ************************************************************ // OBV module visitor for server header. // ************************************************************ 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 3c87b11f6f6..bb4d3432c60 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp @@ -20,10 +20,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_valuetype, - valuetype_ch, - "$Id$") - // ****************************************************** // Valuetype visitor for client header // ****************************************************** diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp index eed0287f2ff..96f4bd54899 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp @@ -19,10 +19,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_valuetype, - valuetype_ci, - "$Id$") - // ************************************************** // Valuetype visitor for client inline. // ************************************************** 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 e72f7fe5669..48f81a550f0 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp @@ -19,10 +19,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_valuetype, - valuetype_cs, - "$Id$") - // ************************************************************ // Valuetype visitor for client stubs. // ************************************************************ diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_arglist_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_arglist_ch.cpp index b998b83f19a..345bc7d2bf7 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_arglist_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_arglist_ch.cpp @@ -19,10 +19,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_valuetype_init, - arglist_ch, - "$Id$") - be_visitor_valuetype_init_arglist_ch::be_visitor_valuetype_init_arglist_ch ( be_visitor_context *ctx ) @@ -44,7 +40,7 @@ be_visitor_valuetype_init_arglist_ch::visit_factory (be_factory *node) if (node->nmembers () > 0) { - os << be_idt << be_idt_nl; + os << be_idt_nl; // All we do is hand over code generation to our scope. if (this->visit_scope (node) == -1) @@ -56,8 +52,7 @@ be_visitor_valuetype_init_arglist_ch::visit_factory (be_factory *node) -1); } - os << be_uidt_nl - << ")"; + os << ")" << be_uidt; } else { @@ -94,7 +89,7 @@ be_visitor_valuetype_init_arglist_ch::post_process (be_decl *bd) TAO_OutStream *os = this->ctx_->stream (); // If we are not the last node in the list of arguments, generate a comma. - if (!this->last_node (bd)) + if (! this->last_node (bd)) { *os << "," << be_nl; } diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ci.cpp index 68e9b6f3bb1..f7e1e85e5d1 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ci.cpp @@ -20,10 +20,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_valuetype, - valuetype_init_ci, - "$Id$") - be_visitor_valuetype_init_ci::be_visitor_valuetype_init_ci ( be_visitor_context *ctx ) 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 638abe1c108..70273f4a524 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 @@ -20,10 +20,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_valuetype, - valuetype_init_cs, - "$Id$") - be_visitor_valuetype_init_cs::be_visitor_valuetype_init_cs ( be_visitor_context *ctx ) diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp index 0e5874a0399..f0516996a16 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp @@ -22,10 +22,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_valuetype, - valuetype_obv_ch, - "$Id$") - // ****************************************************** // Valuetype visitor for client header // ****************************************************** diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ci.cpp index 66750c54136..c55b5fac93d 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ci.cpp @@ -22,10 +22,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_valuetype, - valuetype_obv_ci, - "$Id$") - // ****************************************************** // Valuetype visitor for OBV_ class implementation // ****************************************************** diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp index 30dae918bea..1ef6dbd04cd 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp @@ -22,10 +22,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_valuetype, - valuetype_obv_cs, - "$Id$") - // ****************************************************** // Valuetype visitor for OBV_ class implementation // ****************************************************** diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_sh.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_sh.cpp index 23c10dc317b..8f575c19ca6 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_sh.cpp @@ -18,11 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_valuetype, - valuetype_sh, - "$Id$") - - // ************************************************************ // Valuetype visitor for server header. // ************************************************************ diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_si.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_si.cpp index 34cd0b2f248..02d1bab6a87 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_si.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_si.cpp @@ -18,11 +18,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_valuetype, - valuetype_si, - "$Id$") - - // ************************************************************************ // Valuetype visitor for server inline // ************************************************************************ diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp index f7b12702aad..2cae7b694e7 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp @@ -20,11 +20,6 @@ #include "nr_extern.h" -ACE_RCSID (be_visitor_valuetype, - valuetype_ss, - "$Id$") - - // ************************************************************ // Interface visitor for server skeletons. // ************************************************************ diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd.cpp index 2de72859f6d..7bb9dd55002 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd.cpp @@ -35,7 +35,3 @@ #include "be_visitor_valuetype_fwd/any_op_ch.cpp" #include "be_visitor_valuetype_fwd/cdr_op_ch.cpp" -ACE_RCSID (be, - be_visitor_valuetype_fwd, - "$Id$") - diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp index ff1c24cacc4..c40e268be0b 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp @@ -19,10 +19,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_valuetype_fwd, - any_op_ch, - "$Id$") - // *************************************************************************** // Generates Any operator declarations in the client header // *************************************************************************** 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 8c19388a325..3bea97c31b6 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 @@ -21,10 +21,6 @@ // // ================================================================ -ACE_RCSID (be_visitor_valuetype_fwd, - cdr_op_ch, - "$Id$") - be_visitor_valuetype_fwd_cdr_op_ch::be_visitor_valuetype_fwd_cdr_op_ch ( be_visitor_context *ctx ) 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 2b1638de626..919d13201ca 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 @@ -20,10 +20,6 @@ // // ================================================================ -ACE_RCSID (be_visitor_valuetype_fwd, - cdr_op_ci, - "$Id$") - // **************************************************************** // Interface visitor for generating CDR operator declarations in the // client header 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 d5c8ecd8e5c..59eef1f525b 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 @@ -20,10 +20,6 @@ // // ============================================================================ -ACE_RCSID (be_visitor_valuetype_fwd, - valuetype_fwd_ch, - "$Id$") - be_visitor_valuetype_fwd_ch::be_visitor_valuetype_fwd_ch ( be_visitor_context *ctx ) diff --git a/TAO/TAO_IDL/be/be_visitor_xplicit_pre_proc.cpp b/TAO/TAO_IDL/be/be_visitor_xplicit_pre_proc.cpp new file mode 100644 index 00000000000..d1e1bd5678f --- /dev/null +++ b/TAO/TAO_IDL/be/be_visitor_xplicit_pre_proc.cpp @@ -0,0 +1,230 @@ +/** + * @file be_visitor_xplicit_pre_proc.cpp + * + * $Id$ + * + * @author Jeff Parsons + */ +//============================================================================= + +#include "be_visitor_xplicit_pre_proc.h" +#include "be_home.h" +#include "be_component.h" +#include "be_interface.h" +#include "be_operation.h" +#include "be_argument.h" +#include "be_finder.h" + +#include "ast_module.h" + +#include "utl_namelist.h" + +#include "fe_interface_header.h" +#include "nr_extern.h" +#include "global_extern.h" + +be_visitor_xplicit_pre_proc::be_visitor_xplicit_pre_proc ( + be_visitor_context *ctx) + : be_visitor_ccm_pre_proc (ctx), + xplicit_ (0) +{ +} + +be_visitor_xplicit_pre_proc::~be_visitor_xplicit_pre_proc (void) +{ +} + +int +be_visitor_xplicit_pre_proc::visit_home (be_home *node) +{ + this->node_ = node; + UTL_NameList *parent_list = this->compute_inheritance (node); + + FE_InterfaceHeader header (0, + parent_list, + 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 + // interface construction time. + AST_Module *m = + AST_Module::narrow_from_scope (node->defined_in ()); + + idl_global->scopes ().push (m); + + UTL_ScopedName *explicit_name = + this->create_scoped_name ("", + node->local_name (), + "Explicit", + m); + + be_interface *i = 0; + ACE_NEW_RETURN (i, + be_interface (explicit_name, + header.inherits (), + header.n_inherits (), + header.inherits_flat (), + header.n_inherits_flat (), + false, + false), + 0); + + (void) m->be_add_interface (i); + + i->original_interface (node); + + idl_global->scopes ().push (i); + + if (this->visit_scope (node) != 0) + { + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("be_visitor_ccm_pre_proc::") + ACE_TEXT ("create_explicit - code generation ") + ACE_TEXT ("for home scope failed\n")), + 0); + } + + // Through with the explicit interface scope + idl_global->scopes ().pop (); + + explicit_name->destroy (); + delete explicit_name; + explicit_name = 0; + + header.destroy (); + + parent_list->destroy (); + delete parent_list; + parent_list = 0; + + // Through with the scope containing the home. + idl_global->scopes ().pop (); + + this->xplicit_ = i; + + return 0; +} + +int +be_visitor_xplicit_pre_proc::visit_operation (be_operation *node) +{ + UTL_ScopedName sn (node->local_name (), 0); + + be_operation *home_op = 0; + ACE_NEW_RETURN (home_op, + be_operation (node->return_type (), + node->flags (), + &sn, + false, + false), + -1); + + home_op->be_add_exceptions (node->exceptions ()); + + idl_global->scopes ().top ()->add_to_scope (home_op); + idl_global->scopes ().push (home_op); + + if (this->visit_scope (home_op) != 0) + { + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("be_visitor_ccm_pre_proc::") + ACE_TEXT ("visit_operation - code generation ") + ACE_TEXT ("for scope failed\n")), + -1); + } + + idl_global->scopes ().pop (); + + return 0; +} + +int +be_visitor_xplicit_pre_proc::visit_argument (be_argument *node) +{ + UTL_ScopedName sn (node->local_name (), 0); + + be_argument *added_arg = 0; + ACE_NEW_RETURN (added_arg, + be_argument (node->direction (), + node->field_type (), + &sn), + -1); + + idl_global->scopes ().top ()->add_to_scope (added_arg); + + return 0; +} + +int +be_visitor_xplicit_pre_proc::visit_factory (be_factory *node) +{ + UTL_ScopedName sn (node->local_name (), 0); + + be_operation *added_factory = 0; + ACE_NEW_RETURN (added_factory, + be_operation (this->node_->managed_component (), + AST_Operation::OP_noflags, + &sn, + false, + false), + -1); + + AST_Interface *d = + AST_Interface::narrow_from_scope ( + idl_global->scopes ().top ()); + + idl_global->scopes ().top ()->add_to_scope (added_factory); + idl_global->scopes ().push (added_factory); + + if (this->visit_scope (node) != 0) + { + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("be_visitor_ccm_pre_proc::") + ACE_TEXT ("visit_factory - code generation ") + ACE_TEXT ("for scope failed\n")), + -1); + } + + idl_global->scopes ().pop (); + + return 0; +} + +int +be_visitor_xplicit_pre_proc::visit_finder (be_finder *node) +{ + UTL_ScopedName sn (node->local_name (), 0); + + be_operation *added_finder = 0; + ACE_NEW_RETURN (added_finder, + be_operation (this->node_->managed_component (), + AST_Operation::OP_noflags, + &sn, + false, + false), + -1); + + idl_global->scopes ().top ()->add_to_scope (added_finder); + idl_global->scopes ().push (added_finder); + + if (this->visit_scope (node) != 0) + { + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("be_visitor_ccm_pre_proc::") + ACE_TEXT ("visit_finder - code generation ") + ACE_TEXT ("for scope failed\n")), + -1); + } + + idl_global->scopes ().pop (); + + return 0; +} + +be_interface * +be_visitor_xplicit_pre_proc::xplicit (void) const +{ + return this->xplicit_; +}
\ No newline at end of file diff --git a/TAO/TAO_IDL/be_include/be_factory.h b/TAO/TAO_IDL/be_include/be_factory.h index 08c9b61e7ee..42f04139d67 100644 --- a/TAO/TAO_IDL/be_include/be_factory.h +++ b/TAO/TAO_IDL/be_include/be_factory.h @@ -3,7 +3,7 @@ // ============================================================================ // // = LIBRARY -// TAO IDL +// TAO_IDL_BE // // = FILENAME // be_factory.h @@ -37,13 +37,10 @@ class be_factory : public virtual AST_Factory, { public: be_factory (void); - // Default constructor. be_factory (UTL_ScopedName *n); - // Constructor ~be_factory (void); - // Destructor. virtual void destroy (void); // Cleanup method. @@ -55,9 +52,8 @@ public: virtual AST_Argument *be_add_argument (AST_Argument *arg); // Narrowing - DEF_NARROW_FROM_DECL (be_factory); DEF_NARROW_FROM_SCOPE (be_factory); }; -#endif +#endif // BE_FACTORY_H diff --git a/TAO/TAO_IDL/be_include/be_finder.h b/TAO/TAO_IDL/be_include/be_finder.h new file mode 100644 index 00000000000..5bac7aefb6b --- /dev/null +++ b/TAO/TAO_IDL/be_include/be_finder.h @@ -0,0 +1,46 @@ +// $Id$ + +// ============================================================================ +// +// = LIBRARY +// TAO_IDL_BE +// +// = FILENAME +// be_finder.h +// +// = DESCRIPTION +// Extension of class AST_Finder that provides additional means for C++ +// mapping. +// +// = AUTHOR +// Jeff Parsons +// +// ============================================================================ + +#ifndef BE_FINDER_H +#define BE_FINDER_H + +#include "be_factory.h" + +#include "ast_finder.h" + +class be_finder : public virtual AST_Finder, + public virtual be_factory +{ +public: + be_finder (UTL_ScopedName *n); + + ~be_finder (void); + + virtual void destroy (void); + // Cleanup method. + + // Visiting. + virtual int accept (be_visitor *visitor); + + // Narrowing + DEF_NARROW_FROM_DECL (be_finder); + DEF_NARROW_FROM_SCOPE (be_finder); +}; + +#endif // BE_FINDER_H diff --git a/TAO/TAO_IDL/be_include/be_generator.h b/TAO/TAO_IDL/be_include/be_generator.h index 4bd349c2673..6146a363bd1 100644 --- a/TAO/TAO_IDL/be_include/be_generator.h +++ b/TAO/TAO_IDL/be_include/be_generator.h @@ -262,9 +262,12 @@ public: // Create a node representing a native virtual AST_Native *create_native (UTL_ScopedName *n); - // Create a node representing a OBV factory construct + // Create a node representing a OBV or home factory construct virtual AST_Factory *create_factory (UTL_ScopedName *n); + // Create a node representing an home finder construct. + virtual AST_Finder *create_finder (UTL_ScopedName *n); + virtual AST_PortType *create_porttype (UTL_ScopedName *n); diff --git a/TAO/TAO_IDL/be_include/be_visitor.h b/TAO/TAO_IDL/be_include/be_visitor.h index 3348f593e7a..0ea90f0929b 100644 --- a/TAO/TAO_IDL/be_include/be_visitor.h +++ b/TAO/TAO_IDL/be_include/be_visitor.h @@ -53,6 +53,7 @@ class be_mirror_port; class be_connector; class be_home; class be_factory; +class be_finder; class be_structure; class be_structure_fwd; class be_exception; @@ -123,6 +124,7 @@ public: virtual int visit_connector (be_connector *node); virtual int visit_home (be_home *node); virtual int visit_factory (be_factory *node); + virtual int visit_finder (be_finder *node); virtual int visit_structure (be_structure *node); virtual int visit_structure_fwd (be_structure_fwd *node); virtual int visit_exception (be_exception *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_ccm_pre_proc.h b/TAO/TAO_IDL/be_include/be_visitor_ccm_pre_proc.h index fbcea505907..0ec16610fa2 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_ccm_pre_proc.h +++ b/TAO/TAO_IDL/be_include/be_visitor_ccm_pre_proc.h @@ -6,7 +6,7 @@ // ============================================================================ // // = LIBRARY -// TAO IDL +// TAO_IDL_BE // // = FILENAME // be_visitor_ccm_pre_proc.h @@ -59,12 +59,12 @@ public: virtual int visit_eventtype (be_eventtype *node); virtual int visit_eventtype_fwd (be_eventtype_fwd *node); -private: +protected: // Utility methods to handle the corresponding IDL declarations. - int gen_factories (be_home *node, - AST_Interface *xplicit); - int gen_finders (be_home *node, - AST_Interface *xplicit); +// int gen_factories (be_home *node, +// AST_Interface *xplicit); +// int gen_finders (be_home *node, +// AST_Interface *xplicit); int gen_implicit_ops (be_home *node, AST_Interface *implicit); @@ -114,7 +114,7 @@ private: AST_Decl *parent); UTL_NameList *compute_inheritance (be_home *node); -private: +protected: // These are created for operations implied by 'uses multiple' declarations. Identifier module_id_; be_valuetype *cookie_; diff --git a/TAO/TAO_IDL/be_include/be_visitor_context.h b/TAO/TAO_IDL/be_include/be_visitor_context.h index 8ecc5843691..81ab69a2c2c 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_context.h +++ b/TAO/TAO_IDL/be_include/be_visitor_context.h @@ -34,29 +34,10 @@ class TAO_OutStream; class be_decl; +class be_interface; class be_typedef; class be_attribute; -class be_interface; -class be_interface_fwd; -class be_argument; -class be_array; -class be_constant; -class be_enum; -class be_enum_val; -class be_exceptionl; -class be_field; -class be_module; -class be_operation; -class be_exception; -class be_predefined_type; -class be_root; class be_scope; -class be_sequence; -class be_string; -class be_structure; -class be_typedef; -class be_union; -class be_union_branch; // When interface is defined as macro redefine it as aceinterface #if defined (interface) @@ -145,109 +126,13 @@ public: // are we supposed to generate a comma? be_interface *interface (void) const; - void interface (be_interface*); + void interface (be_interface *); // In some cases we need to generate the objects of one interface as // members of a derived visitor (the TIE classes are a good // example). This field is use to hold the interface where we are // *generating* code, as opposed to the interfaces where the methods // or structures are defined. - // = helpers - - // visitors may need the actual type of the node stored in this context. We - // could have kept separate nodes but that would have increased the size of - // the context class by a large extent. So we will rely on the - // "narrow_from_decl" approach - - // two types of helpers are provided here. One of them returns the node as - // the desired actual type. The other returns the scope as the desired type. - - be_argument *be_node_as_argument (void); - // return the node as argument if possible - - be_array *be_node_as_array (void); - // return the node as array if possible - - be_attribute *be_node_as_attribute (void); - // return the node as attribute if possible - - be_constant *be_node_as_constant (void); - // return the node as constant if possible - - be_enum *be_node_as_enum (void); - // return the node as enum if possible - - be_enum_val *be_node_as_enum_val (void); - // return the node as enum_val if possible - - be_exception *be_node_as_exception (void); - // return the node as exception if possible - - be_field *be_node_as_field (void); - // return the node as field if possible - - be_interface *be_node_as_interface (void); - // return the node as interface if possible - - be_interface_fwd *be_node_as_interface_fwd (void); - // return the node as interface_fwd if possible - - be_module *be_node_as_module (void); - // return the node as module if possible - - be_operation *be_node_as_operation (void); - // return the node as operation if possible - - be_predefined_type *be_node_as_predefined_type (void); - // return the node as predefined_type if possible - - be_root *be_node_as_root (void); - // return the node as root if possible - - be_sequence *be_node_as_sequence (void); - // return the node as sequence if possible - - be_string *be_node_as_string (void); - // return the node as string if possible - - be_structure *be_node_as_structure (void); - // return the node as structure if possible - - be_typedef *be_node_as_typedef (void); - // return the node as typedef if possible - - be_union *be_node_as_union (void); - // return the node as union if possible - - be_union_branch *be_node_as_union_branch (void); - // return the node as union_branch if possible - - // for scope - - be_enum *be_scope_as_enum (void); - // return the scope as enum if possible - - be_exception *be_scope_as_exception (void); - // return the scope as exception if possible - - be_interface *be_scope_as_interface (void); - // return the scope as interface if possible - - be_module *be_scope_as_module (void); - // return the scope as module if possible - - be_operation *be_scope_as_operation (void); - // return the scope as operation if possible - - be_root *be_scope_as_root (void); - // return the scope as root if possible - - be_structure *be_scope_as_structure (void); - // return the scope as structure if possible - - 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 @@ -287,10 +172,6 @@ private: be_interface *interface_; // See the method declaration above. - - // Storage for the current template module params and args. - FE_Utils::T_PARAMLIST_INFO *template_params_; - FE_Utils::T_ARGLIST *template_args_; }; #if defined (interface) diff --git a/TAO/TAO_IDL/be_include/be_visitor_home/home_ex_idl.h b/TAO/TAO_IDL/be_include/be_visitor_home/home_ex_idl.h index d47d19c42c8..fe036bdb105 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_home/home_ex_idl.h +++ b/TAO/TAO_IDL/be_include/be_visitor_home/home_ex_idl.h @@ -40,10 +40,10 @@ public: virtual int visit_home (be_home *node); - /// To regenerate attribute & operation declarations. virtual int visit_attribute (be_attribute *node); virtual int visit_operation (be_operation *node); virtual int visit_argument (be_argument *node); + virtual int visit_factory (be_factory *node); /// To regenerate the name of an anonymous type. /// Anonymous arrays are not allowed. @@ -64,10 +64,6 @@ private: const char *prefix = "", bool init_op = false); - void gen_factories (void); - void gen_finders (void); - void gen_init_ops (AST_Home::INIT_LIST & list); - void gen_home_executor (void); /// The CCM preproc visitor changed the scoped name and the diff --git a/TAO/TAO_IDL/be_include/be_visitor_home/home_exh.h b/TAO/TAO_IDL/be_include/be_visitor_home/home_exh.h index 781d77779b7..30fa01f07f9 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_home/home_exh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_home/home_exh.h @@ -41,21 +41,7 @@ public: virtual int visit_home (be_home *node); virtual int visit_operation (be_operation *node); virtual int visit_attribute (be_attribute *node); - -private: - int gen_exec_class (void); - - int gen_ops_attrs (void); - - int gen_factories (void); - int gen_factories_r (AST_Home *node); - - int gen_finders (void); - int gen_finders_r (AST_Home *node); - - int gen_init_ops_i (AST_Home::INIT_LIST & list); - - void gen_entrypoint (void); + virtual int visit_factory (be_factory *node); /// Helper method passed to traverse_inheritance_graph(), /// collects supported operations and attributes. @@ -64,6 +50,11 @@ private: TAO_OutStream *); private: + int gen_exec_class (void); + + void gen_entrypoint (void); + +private: be_home *node_; AST_Component *comp_; TAO_OutStream &os_; diff --git a/TAO/TAO_IDL/be_include/be_visitor_home/home_exs.h b/TAO/TAO_IDL/be_include/be_visitor_home/home_exs.h index 7e97dd71af7..b4f992ba0c2 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_home/home_exs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_home/home_exs.h @@ -41,20 +41,11 @@ public: virtual int visit_home (be_home *node); virtual int visit_operation (be_operation *node); virtual int visit_attribute (be_attribute *node); + virtual int visit_factory (be_factory *node); private: int gen_exec_class (void); - int gen_ops_attrs (void); - - int gen_factories (void); - int gen_factories_r (AST_Home *node); - - int gen_finders (void); - int gen_finders_r (AST_Home *node); - - int gen_init_ops_i (AST_Home::INIT_LIST & list); - void gen_entrypoint (void); private: diff --git a/TAO/TAO_IDL/be_include/be_visitor_home/home_svh.h b/TAO/TAO_IDL/be_include/be_visitor_home/home_svh.h index af922537a57..a56852de596 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_home/home_svh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_home/home_svh.h @@ -40,20 +40,12 @@ public: virtual int visit_home (be_home *node); virtual int visit_operation (be_operation *node); virtual int visit_attribute (be_attribute *node); + virtual int visit_factory (be_factory *node); + virtual int visit_finder (be_finder *node); private: int gen_servant_class (void); - int gen_ops_attrs (void); - - int gen_factories (void); - int gen_factories_r (AST_Home *node); - - int gen_finders (void); - int gen_finders_r (AST_Home *node); - - int gen_init_ops_i (AST_Home::INIT_LIST & list); - void gen_entrypoint (void); /// Helper method passed to traverse_inheritance_graph(), diff --git a/TAO/TAO_IDL/be_include/be_visitor_home/home_svs.h b/TAO/TAO_IDL/be_include/be_visitor_home/home_svs.h index c3fbcc394ea..239eda8dfb8 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_home/home_svs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_home/home_svs.h @@ -5,7 +5,7 @@ // ============================================================================ // // = LIBRARY -// TAO IDL +// TAO_IDL_BE // // = FILENAME // home_svs.h @@ -29,7 +29,8 @@ class be_visitor_home_svs : public be_visitor_scope // be_visitor_home_svs // // = DESCRIPTION - // This is a concrete visitor to generate the servant header for component. + // This is a concrete visitor to generate the servant + // source for a comopnent home. // // public: @@ -41,35 +42,21 @@ public: virtual int visit_operation (be_operation *node); virtual int visit_attribute (be_attribute *node); virtual int visit_argument (be_argument *node); + virtual int visit_factory (be_factory *node); + virtual int visit_finder (be_finder *node); private: int gen_servant_class (void); - int gen_ops_attrs (void); - - int gen_factories (void); - int gen_factories_r (AST_Home *node); - - int gen_finders (void); - int gen_finders_r (AST_Home *node); - - int gen_init_ops (AST_Home::INIT_LIST & list, - bool finder_list); - void gen_entrypoint (void); - /// Helper method passed to traverse_inheritance_graph(), - /// collects supported operations and attributes. - static int op_attr_defn_helper (be_interface *, - be_interface *, - TAO_OutStream *); - private: be_home *node_; AST_Component *comp_; TAO_OutStream &os_; ACE_CString export_macro_; bool swapping_; + bool for_finder_; }; /// Worker class passed to traverse_inheritance_graph(), diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/arglist.h b/TAO/TAO_IDL/be_include/be_visitor_operation/arglist.h index ee03504ded5..1745f5c03e8 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/arglist.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/arglist.h @@ -38,19 +38,15 @@ class be_visitor_operation_arglist : public be_visitor_operation // public: be_visitor_operation_arglist (be_visitor_context *ctx); - // constructor ~be_visitor_operation_arglist (void); - // destructor virtual int visit_operation (be_operation *node); - // visit the operation - + virtual int visit_factory (be_factory *node); virtual int visit_argument (be_argument *node); - // visit each argument virtual int post_process (be_decl *); - // stuff to o/p after each element of the scope is handled. + // Stuff to output after each element of the scope is handled. void unused (bool val); // Set the member. diff --git a/TAO/TAO_IDL/be_include/be_visitor_xplicit_pre_proc.h b/TAO/TAO_IDL/be_include/be_visitor_xplicit_pre_proc.h new file mode 100644 index 00000000000..39e1c8142a1 --- /dev/null +++ b/TAO/TAO_IDL/be_include/be_visitor_xplicit_pre_proc.h @@ -0,0 +1,56 @@ +// +// $Id$ +// + +/* -*- c++ -*- */ +// ============================================================================ +// +// = LIBRARY +// TAO_IDL_BE +// +// = FILENAME +// be_visitor_xplicit_pre_proc.h +// +// = DESCRIPTION +// This visitor creates the explicit home interface +// +// = AUTHOR +// Jeff Parsons +// +// ============================================================================ + +#ifndef TAO_BE_VISITOR_XPLICIT_PRE_PROC_H +#define TAO_BE_VISITOR_XPLICIT_PRE_PROC_H + +#include "be_visitor_ccm_pre_proc.h" + +class be_visitor_xplicit_pre_proc : public be_visitor_ccm_pre_proc +{ + // + // = TITLE + // be_visitor_xplicit_pre_proc + // + // = DESCRIPTION + // Adds home explicit implied IDL code to the AST. + // +public: + be_visitor_xplicit_pre_proc (be_visitor_context *ctx); + + virtual ~be_visitor_xplicit_pre_proc (void); + + virtual int visit_home (be_home *node); + + virtual int visit_operation (be_operation *node); + virtual int visit_argument (be_argument *node); + virtual int visit_factory (be_factory *node); + virtual int visit_finder (be_finder *node); + + // Member accessor + be_interface *xplicit (void) const; + +private: + be_interface *xplicit_; + be_home *node_; +}; + +#endif // TAO_BE_VISITOR_XPLICIT_PRE_PROC_H diff --git a/TAO/TAO_IDL/driver/drv_mcpp_preproc.cpp b/TAO/TAO_IDL/driver/drv_mcpp_preproc.cpp index 4b47e58defb..7b61c2a1da9 100644 --- a/TAO/TAO_IDL/driver/drv_mcpp_preproc.cpp +++ b/TAO/TAO_IDL/driver/drv_mcpp_preproc.cpp @@ -90,10 +90,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "mcpp_lib.h" -ACE_RCSID (driver, - drv_preproc, - "$Id$") - // Storage for preprocessor args. unsigned long const DRV_MAX_ARGCOUNT = 1024; unsigned long DRV_argcount = 0; diff --git a/TAO/TAO_IDL/driver/drv_preproc.cpp b/TAO/TAO_IDL/driver/drv_preproc.cpp index aae06ad4e98..234fc4f8f55 100644 --- a/TAO/TAO_IDL/driver/drv_preproc.cpp +++ b/TAO/TAO_IDL/driver/drv_preproc.cpp @@ -88,10 +88,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_fcntl.h" -ACE_RCSID (driver, - drv_preproc, - "$Id$") - // Storage for preprocessor args. unsigned long const DRV_MAX_ARGCOUNT = 1024; unsigned long DRV_argcount = 0; diff --git a/TAO/TAO_IDL/fe/fe_extern.cpp b/TAO/TAO_IDL/fe/fe_extern.cpp index efc76471ca2..874f02b33ac 100644 --- a/TAO/TAO_IDL/fe/fe_extern.cpp +++ b/TAO/TAO_IDL/fe/fe_extern.cpp @@ -76,10 +76,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "utl_indenter.h" #include "ace/UUID.h" -ACE_RCSID (fe, - fe_extern, - "$Id$") - extern int tao_yyparse (void); #ifdef USE_MCPP_BUFFER_LEXING @@ -95,11 +91,6 @@ FE_yyparse (void) { int const result = tao_yyparse (); - if (0 == idl_global->err_count ()) - { - idl_global->root ()->call_add (); - } - #ifdef USE_MCPP_BUFFER_LEXING ACE_OS::free (tao_preproc_buffer); tao_preproc_buffer_length = 0; diff --git a/TAO/TAO_IDL/fe/fe_global.cpp b/TAO/TAO_IDL/fe/fe_global.cpp index f60767a0ac3..a65b88d2ec9 100644 --- a/TAO/TAO_IDL/fe/fe_global.cpp +++ b/TAO/TAO_IDL/fe/fe_global.cpp @@ -2,10 +2,4 @@ #include "global_extern.h" - -ACE_RCSID (fe, - fe_global, - "$Id$") - - IDL_GlobalData *idl_global = 0; diff --git a/TAO/TAO_IDL/fe/fe_init.cpp b/TAO/TAO_IDL/fe/fe_init.cpp index 11d2e1c0a3f..7883b92ceee 100644 --- a/TAO/TAO_IDL/fe/fe_init.cpp +++ b/TAO/TAO_IDL/fe/fe_init.cpp @@ -75,10 +75,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "ace/Env_Value_T.h" #include "ace/UUID.h" -ACE_RCSID (fe, - fe_init, - "$Id$") - const size_t LOCAL_ESCAPES_BUFFER_SIZE = 1024; // Populate the global scope with all predefined entities. diff --git a/TAO/TAO_IDL/fe/fe_private.cpp b/TAO/TAO_IDL/fe/fe_private.cpp index d80fb132ee6..d83e6b31ed7 100644 --- a/TAO/TAO_IDL/fe/fe_private.cpp +++ b/TAO/TAO_IDL/fe/fe_private.cpp @@ -67,8 +67,4 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "fe_private.h" #include "utl_strlist.h" -ACE_RCSID (fe, - fe_private, - "$Id$") - UTL_StrList *DRV_global_pragmas = 0; diff --git a/TAO/TAO_IDL/fe/idl.yy b/TAO/TAO_IDL/fe/idl.yy index a979f815d3f..8a19355f22f 100644 --- a/TAO/TAO_IDL/fe/idl.yy +++ b/TAO/TAO_IDL/fe/idl.yy @@ -103,6 +103,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "ast_sequence.h" #include "ast_string.h" #include "ast_factory.h" +#include "ast_finder.h" #include "ast_exception.h" #include "ast_param_holder.h" #include "ast_visitor_tmpl_module_inst.h" @@ -1666,7 +1667,7 @@ interface_forward : AST_PredefinedType::PT_pseudo, &n ); - (void) s->add_predefined_type (pdt); + s->add_to_scope (pdt); $1->destroy (); @@ -5869,30 +5870,17 @@ factory_decl : * Create a node representing a factory operation * and add it to the enclosing scope. */ - if (s != 0) - { - AST_Home *h = AST_Home::narrow_from_scope (s); - - o = - idl_global->gen ()->create_operation ( - h->managed_component (), - AST_Operation::OP_noflags, - &n, - false, - false - ); - - h->factories ().enqueue_tail (o); - } + AST_Factory *f = idl_global->gen ()->create_factory (&n); + (void) s->fe_add_factory (f); $2->destroy (); delete $2; $2 = 0; /* - * Push the operation scope onto the scopes stack. + * Push the factory scope onto the scopes stack. */ - idl_global->scopes ().push (o); + idl_global->scopes ().push (f); } init_parameter_list { @@ -5903,24 +5891,18 @@ factory_decl : { // opt_raises UTL_Scope *s = idl_global->scopes ().top_non_null (); - AST_Operation *o = 0; idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseCompleted); /* - * Add exceptions and context to the operation. + * Add exceptions and context to the factory. */ - if (s != 0 && s->scope_node_type () == AST_Decl::NT_op) + if ($6 != 0) { - o = AST_Operation::narrow_from_scope (s); - - if ($6 != 0 && o != 0) - { - (void) o->fe_add_exceptions ($6); - } + (void) s->fe_add_exceptions ($6); } /* - * Done with this operation. Pop its scope from the scopes stack. + * Done with this factory. Pop its scope from the scopes stack. */ idl_global->scopes ().pop (); } @@ -5934,28 +5916,18 @@ finder_decl : UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ($2, 0); - AST_Operation *o = 0; + idl_global->set_parse_state (IDL_GlobalData::PS_OpIDSeen); /* - * Create a node representing a finder operation + * Create a node representing a home finder * and add it to the enclosing scope. */ - if (s != 0) - { - AST_Home *h = AST_Home::narrow_from_scope (s); - - o = - idl_global->gen ()->create_operation ( - h->managed_component (), - AST_Operation::OP_noflags, - &n, - false, - false - ); - - h->finders ().enqueue_tail (o); - } + AST_Finder *f = + idl_global->gen ()->create_finder (&n); + + (void) s->fe_add_finder (f); + $2->destroy (); delete $2; @@ -5964,7 +5936,7 @@ finder_decl : /* * Push the operation scope onto the scopes stack. */ - idl_global->scopes ().push (o); + idl_global->scopes ().push (f); } init_parameter_list { @@ -5979,16 +5951,11 @@ finder_decl : idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseCompleted); /* - * Add exceptions and context to the operation. + * Add exceptions and context to the finder. */ - if (s != 0 && s->scope_node_type () == AST_Decl::NT_op) + if ($6 != 0) { - o = AST_Operation::narrow_from_scope (s); - - if ($6 != 0 && o != 0) - { - (void) o->fe_add_exceptions ($6); - } + (void) s->fe_add_exceptions ($6); } /* diff --git a/TAO/TAO_IDL/fe/y.tab.cpp b/TAO/TAO_IDL/fe/y.tab.cpp index bdd00020072..cdb63cae422 100644 --- a/TAO/TAO_IDL/fe/y.tab.cpp +++ b/TAO/TAO_IDL/fe/y.tab.cpp @@ -273,6 +273,7 @@ #include "ast_sequence.h" #include "ast_string.h" #include "ast_factory.h" +#include "ast_finder.h" #include "ast_exception.h" #include "ast_param_holder.h" #include "ast_visitor_tmpl_module_inst.h" @@ -4103,7 +4104,7 @@ tao_yyreduce: AST_PredefinedType::PT_pseudo, &n ); - (void) s->add_predefined_type (pdt); + s->add_to_scope (pdt); (tao_yyvsp[(1) - (1)].idval)->destroy (); @@ -8693,37 +8694,24 @@ tao_yyreduce: UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((tao_yyvsp[(2) - (2)].idval), 0); - AST_Operation *o = 0; + idl_global->set_parse_state (IDL_GlobalData::PS_OpIDSeen); /* - * Create a node representing a factory operation + * Create a node representing a factory * and add it to the enclosing scope. */ - if (s != 0) - { - AST_Home *h = AST_Home::narrow_from_scope (s); - - o = - idl_global->gen ()->create_operation ( - h->managed_component (), - AST_Operation::OP_noflags, - &n, - false, - false - ); - - h->factories ().enqueue_tail (o); - } + AST_Factory *f = idl_global->gen ()->create_factory (&n); + (void) s->fe_add_factory (f); (tao_yyvsp[(2) - (2)].idval)->destroy (); delete (tao_yyvsp[(2) - (2)].idval); (tao_yyvsp[(2) - (2)].idval) = 0; /* - * Push the operation scope onto the scopes stack. + * Push the factory scope onto the scopes stack. */ - idl_global->scopes ().push (o); + idl_global->scopes ().push (f); } break; @@ -8740,24 +8728,18 @@ tao_yyreduce: { // opt_raises UTL_Scope *s = idl_global->scopes ().top_non_null (); - AST_Operation *o = 0; idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseCompleted); /* - * Add exceptions and context to the operation. + * Add exceptions and context to the factory. */ - if (s != 0 && s->scope_node_type () == AST_Decl::NT_op) + if ((tao_yyvsp[(6) - (6)].nlval) != 0) { - o = AST_Operation::narrow_from_scope (s); - - if ((tao_yyvsp[(6) - (6)].nlval) != 0 && o != 0) - { - (void) o->fe_add_exceptions ((tao_yyvsp[(6) - (6)].nlval)); - } + (void) s->fe_add_exceptions ((tao_yyvsp[(6) - (6)].nlval)); } /* - * Done with this operation. Pop its scope from the scopes stack. + * Done with this factory. Pop its scope from the scopes stack. */ idl_global->scopes ().pop (); } @@ -8770,28 +8752,18 @@ tao_yyreduce: UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((tao_yyvsp[(2) - (2)].idval), 0); - AST_Operation *o = 0; + idl_global->set_parse_state (IDL_GlobalData::PS_OpIDSeen); /* - * Create a node representing a finder operation + * Create a node representing a home finder * and add it to the enclosing scope. */ - if (s != 0) - { - AST_Home *h = AST_Home::narrow_from_scope (s); - - o = - idl_global->gen ()->create_operation ( - h->managed_component (), - AST_Operation::OP_noflags, - &n, - false, - false); - - h->finders ().enqueue_tail (o); - } - + AST_Finder *f = + idl_global->gen ()->create_finder (&n); + + (void) s->fe_add_finder (f); + (tao_yyvsp[(2) - (2)].idval)->destroy (); delete (tao_yyvsp[(2) - (2)].idval); (tao_yyvsp[(2) - (2)].idval) = 0; @@ -8799,7 +8771,7 @@ tao_yyreduce: /* * Push the operation scope onto the scopes stack. */ - idl_global->scopes ().push (o); + idl_global->scopes ().push (f); } break; @@ -8816,24 +8788,19 @@ tao_yyreduce: { // opt_raises UTL_Scope *s = idl_global->scopes ().top_non_null (); - AST_Operation *o = 0; + idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseCompleted); /* - * Add exceptions and context to the operation. + * Add exceptions and context to the finder. */ - if (s != 0 && s->scope_node_type () == AST_Decl::NT_op) + if ((tao_yyvsp[(6) - (6)].nlval) != 0) { - o = AST_Operation::narrow_from_scope (s); - - if ((tao_yyvsp[(6) - (6)].nlval) != 0 && o != 0) - { - (void) o->fe_add_exceptions ((tao_yyvsp[(6) - (6)].nlval)); - } + (void) s->fe_add_exceptions ((tao_yyvsp[(6) - (6)].nlval)); } /* - * Done with this operation. Pop its scope from the scopes stack. + * Done with this finder. Pop its scope from the scopes stack. */ idl_global->scopes ().pop (); } diff --git a/TAO/TAO_IDL/include/ast_decl.h b/TAO/TAO_IDL/include/ast_decl.h index 5187a98fc9f..8d4b887cc6e 100644 --- a/TAO/TAO_IDL/include/ast_decl.h +++ b/TAO/TAO_IDL/include/ast_decl.h @@ -152,7 +152,8 @@ public: , NT_native // Denotes a native type // dependent on the programming // language - , NT_factory // Denotes a OBV factory construct + , NT_factory // Denotes a OBV or home factory construct + , NT_finder // Denotes a home finder construct , NT_component // Denotes a CORBA component , NT_component_fwd // Denotes a forward declared component , NT_home // Denotes a CORBA component home @@ -261,9 +262,6 @@ public: Identifier *original_local_name (void); void original_local_name (Identifier *); - bool added (void); - void set_added (bool is_it); - // Narrowing. DEF_NARROW_FROM_DECL(AST_Decl); @@ -357,9 +355,6 @@ private: Identifier *pd_original_local_name; // _cxx_ removed if any. - bool pd_added; - // Already added. - char *full_name_; // Our full scoped name. diff --git a/TAO/TAO_IDL/include/ast_factory.h b/TAO/TAO_IDL/include/ast_factory.h index f11092b7f3d..b2dc4ba295f 100644 --- a/TAO/TAO_IDL/include/ast_factory.h +++ b/TAO/TAO_IDL/include/ast_factory.h @@ -67,7 +67,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #ifndef _AST_FACTORY_AST_FACTORY_HH #define _AST_FACTORY_AST_FACTORY_HH -// Representation of OBV factory construct declaration. +// Representation of OBV and component home factory +// construct declaration. #include "ast_decl.h" #include "utl_scope.h" diff --git a/TAO/TAO_IDL/include/ast_finder.h b/TAO/TAO_IDL/include/ast_finder.h new file mode 100644 index 00000000000..ad363897b8c --- /dev/null +++ b/TAO/TAO_IDL/include/ast_finder.h @@ -0,0 +1,33 @@ +// This may look like C, but it's really -*- C++ -*- +// $Id$ + +#ifndef TAO_IDL_AST_FINDER_H +#define TAO_IDL_AST_FINDER_H + +// Representation of component home finder construct declaration. + +#include "ast_factory.h" + +class TAO_IDL_FE_Export AST_Finder : public virtual AST_Factory +{ +public: + + AST_Finder (UTL_ScopedName *n); + + virtual ~AST_Finder (void); + // Narrowing. + + DEF_NARROW_FROM_DECL(AST_Finder); + DEF_NARROW_FROM_SCOPE(AST_Finder); + + // AST Dumping. + virtual void dump (ACE_OSTREAM_TYPE &o); + + // Cleanup function. + virtual void destroy (void); + + // Visiting. + virtual int ast_accept (ast_visitor *visitor); +}; + +#endif // TAO_IDL_AST_FINDER_H diff --git a/TAO/TAO_IDL/include/ast_generator.h b/TAO/TAO_IDL/include/ast_generator.h index fa342900cad..291dd6efabc 100644 --- a/TAO/TAO_IDL/include/ast_generator.h +++ b/TAO/TAO_IDL/include/ast_generator.h @@ -92,6 +92,7 @@ class AST_Template_Module; class AST_Template_Module_Inst; class AST_Template_Module_Ref; class AST_Param_Holder; +class AST_Finder; // Defines base class for node generators. @@ -346,9 +347,12 @@ public: // Create a node representing a native. virtual AST_Native *create_native (UTL_ScopedName *n); - // Create a node representing an OBV factory construct. + // Create a node representing an OBV or home factory construct. virtual AST_Factory *create_factory (UTL_ScopedName *n); + // Create a node representing an home finder construct. + virtual AST_Finder *create_finder (UTL_ScopedName *n); + // Create a node representing a valuebox. virtual AST_ValueBox *create_valuebox (UTL_ScopedName *n, AST_Type *boxed_type); diff --git a/TAO/TAO_IDL/include/ast_home.h b/TAO/TAO_IDL/include/ast_home.h index 1dafeaeda0a..547b6aae8bd 100644 --- a/TAO/TAO_IDL/include/ast_home.h +++ b/TAO/TAO_IDL/include/ast_home.h @@ -5,7 +5,6 @@ #define _AST_HOME_AST_HOME_HH #include "ast_interface.h" -#include "ace/Unbounded_Queue.h" class AST_Home; class AST_Component; @@ -46,12 +45,6 @@ public: AST_Component *managed_component (void) const; AST_Type *primary_key (void) const; - - typedef ACE_Unbounded_Queue<AST_Operation *> INIT_LIST; - - INIT_LIST &factories (void); - - INIT_LIST &finders (void); // Cleanup function. virtual void destroy (void); @@ -66,13 +59,20 @@ public: // Visiting. virtual int ast_accept (ast_visitor *visitor); + +private: + // Scope Management Protocol. + + friend int tao_yyparse (void); + friend class ast_visitor_tmpl_module_inst; + + virtual AST_Factory *fe_add_factory (AST_Factory *f); + virtual AST_Finder *fe_add_finder (AST_Finder *f); private: AST_Home *pd_base_home; AST_Component *pd_managed_component; AST_Type *pd_primary_key; - INIT_LIST pd_factories; - INIT_LIST pd_finders; bool owns_primary_key_; }; diff --git a/TAO/TAO_IDL/include/ast_valuetype.h b/TAO/TAO_IDL/include/ast_valuetype.h index bacd756a3ab..344570c7886 100644 --- a/TAO/TAO_IDL/include/ast_valuetype.h +++ b/TAO/TAO_IDL/include/ast_valuetype.h @@ -6,7 +6,8 @@ #include "ast_interface.h" -class TAO_IDL_FE_Export AST_ValueType : public virtual AST_Interface +class TAO_IDL_FE_Export AST_ValueType + : public virtual AST_Interface { public: AST_ValueType (void); diff --git a/TAO/TAO_IDL/include/ast_visitor.h b/TAO/TAO_IDL/include/ast_visitor.h index d14253e0914..8596439b7a7 100644 --- a/TAO/TAO_IDL/include/ast_visitor.h +++ b/TAO/TAO_IDL/include/ast_visitor.h @@ -50,6 +50,7 @@ class AST_EventType; class AST_EventTypeFwd; class AST_Home; class AST_Factory; +class AST_Finder; class AST_Structure; class AST_StructureFwd; class AST_Exception; @@ -118,6 +119,7 @@ public: virtual int visit_eventtype (AST_EventType *node) = 0; virtual int visit_eventtype_fwd (AST_EventTypeFwd *node) = 0; virtual int visit_factory (AST_Factory *node) = 0; + virtual int visit_finder (AST_Finder *node) = 0; virtual int visit_structure (AST_Structure *node) = 0; virtual int visit_structure_fwd (AST_StructureFwd *node) = 0; virtual int visit_exception (AST_Exception *node) = 0; diff --git a/TAO/TAO_IDL/include/ast_visitor_reifying.h b/TAO/TAO_IDL/include/ast_visitor_reifying.h index a57b1e2532a..ddbd207e7c1 100644 --- a/TAO/TAO_IDL/include/ast_visitor_reifying.h +++ b/TAO/TAO_IDL/include/ast_visitor_reifying.h @@ -76,6 +76,7 @@ public: virtual int visit_connector (AST_Connector *node); virtual int visit_eventtype_fwd (AST_EventTypeFwd *node); virtual int visit_factory (AST_Factory *node); + virtual int visit_finder (AST_Finder *node); virtual int visit_structure (AST_Structure *node); virtual int visit_structure_fwd (AST_StructureFwd *node); virtual int visit_expression (AST_Expression *node); diff --git a/TAO/TAO_IDL/include/ast_visitor_tmpl_module_inst.h b/TAO/TAO_IDL/include/ast_visitor_tmpl_module_inst.h index 49992a55099..63f09e21489 100644 --- a/TAO/TAO_IDL/include/ast_visitor_tmpl_module_inst.h +++ b/TAO/TAO_IDL/include/ast_visitor_tmpl_module_inst.h @@ -98,6 +98,7 @@ public: virtual int visit_structure (AST_Structure *node); virtual int visit_field (AST_Field *node); virtual int visit_factory (AST_Factory *node); + virtual int visit_finder (AST_Finder *node); private: // If arg is a param holder, return the matching template arg, @@ -120,6 +121,10 @@ private: // eventtype or a valuetype. bool for_eventtype_; + // Flag to branch in visit_factory() where we create a + // finder or a factory. + bool for_finder_; + // Flag to short_circuit reifying if we are the base class of // ast_visitor_tmpl_module_ref. bool ref_only_; diff --git a/TAO/TAO_IDL/include/utl_scope.h b/TAO/TAO_IDL/include/utl_scope.h index 3dd7943b7ab..f9f697010da 100644 --- a/TAO/TAO_IDL/include/utl_scope.h +++ b/TAO/TAO_IDL/include/utl_scope.h @@ -120,6 +120,7 @@ class AST_Typedef; class AST_Array; class AST_Native; class AST_Factory; +class AST_Finder; class AST_PortType; class AST_Provides; class AST_Uses; @@ -154,76 +155,6 @@ public: // Destructor. virtual ~UTL_Scope (void); - // Scope Management Protocol. - virtual AST_PredefinedType *add_predefined_type (AST_PredefinedType *t); - - virtual AST_Module *add_module (AST_Module *m); - - virtual AST_Interface *add_interface (AST_Interface *i); - - virtual AST_InterfaceFwd *add_interface_fwd (AST_InterfaceFwd *i); - - virtual AST_ValueType *add_valuetype (AST_ValueType *i); - - virtual AST_ValueTypeFwd *add_valuetype_fwd (AST_ValueTypeFwd *i); - - virtual AST_EventType *add_eventtype (AST_EventType *i); - - virtual AST_EventTypeFwd *add_eventtype_fwd (AST_EventTypeFwd *i); - - virtual AST_Component *add_component (AST_Component *i); - - virtual AST_ComponentFwd *add_component_fwd (AST_ComponentFwd *i); - - virtual AST_Home *add_home (AST_Home *i); - - virtual AST_Constant *add_constant (AST_Constant *c); - - virtual AST_Exception *add_exception (AST_Exception *e); - - virtual AST_Attribute *add_attribute (AST_Attribute *a); - - virtual AST_Operation *add_operation (AST_Operation *o); - - virtual AST_Argument *add_argument (AST_Argument *a); - - virtual AST_Union *add_union (AST_Union *u); - - virtual AST_UnionFwd *add_union_fwd (AST_UnionFwd *u); - - virtual AST_UnionBranch *add_union_branch (AST_UnionBranch *b); - - virtual AST_Structure *add_structure (AST_Structure *s); - - virtual AST_StructureFwd *add_structure_fwd (AST_StructureFwd *s); - - virtual AST_Field *add_field (AST_Field *f); - - virtual AST_Enum *add_enum (AST_Enum *e); - - virtual AST_EnumVal *add_enum_val (AST_EnumVal *v); - - virtual AST_Typedef *add_typedef (AST_Typedef *t); - - virtual UTL_StrList *add_context (UTL_StrList *c); - - virtual UTL_NameList *add_exceptions (UTL_NameList *e); - - virtual AST_Sequence *add_sequence (AST_Sequence *s); - - virtual AST_String *add_string (AST_String *s); - - virtual AST_Array *add_array (AST_Array *a); - - virtual AST_Native *add_native (AST_Native *n); - - virtual AST_Factory *add_factory (AST_Factory *f); - - virtual AST_PortType *add_porttype (AST_PortType *p); - - // Call back end add_XXX functions for this scope. - virtual AST_Decl *call_add (void); - // Data Accessors. AST_Decl::NodeType scope_node_type (void) { @@ -493,6 +424,9 @@ protected: virtual AST_Factory *fe_add_factory (AST_Factory *f); + + virtual + AST_Finder *fe_add_finder (AST_Finder *f); virtual AST_ValueBox *fe_add_valuebox (AST_ValueBox *vb); diff --git a/TAO/TAO_IDL/narrow/narrow.cpp b/TAO/TAO_IDL/narrow/narrow.cpp index 038d038a7c3..534d1360e32 100644 --- a/TAO/TAO_IDL/narrow/narrow.cpp +++ b/TAO/TAO_IDL/narrow/narrow.cpp @@ -74,22 +74,22 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "ast_home.h" #include "ast_operation.h" #include "ast_factory.h" +#include "ast_finder.h" #include "ast_exception.h" #include "ast_union.h" #include "ast_enum.h" #include "ast_interface_fwd.h" #include "utl_scope.h" -ACE_RCSID (narrow, - narrow, - "$Id$") - // Narrowing functions for AST TAO_IDL_FE_Export AST_Decl * ScopeAsDecl (UTL_Scope *s) { - if (s == 0) return 0; + if (s == 0) + { + return 0; + } switch (s->scope_node_type ()) { @@ -115,6 +115,8 @@ ScopeAsDecl (UTL_Scope *s) return AST_Operation::narrow_from_scope (s); case AST_Decl::NT_factory: return AST_Factory::narrow_from_scope (s); + case AST_Decl::NT_finder: + return AST_Finder::narrow_from_scope (s); case AST_Decl::NT_except: return AST_Exception::narrow_from_scope (s); case AST_Decl::NT_union: @@ -134,48 +136,53 @@ ScopeAsDecl (UTL_Scope *s) TAO_IDL_FE_Export UTL_Scope * DeclAsScope (AST_Decl *d) { - if (d == 0) return 0; - - switch (d->node_type ()) - { - case AST_Decl::NT_interface_fwd: - /* - * Resolve forward declared interface by looking at full_definition() - * field and iterating - */ - d = (AST_InterfaceFwd::narrow_from_decl (d))->full_definition (); - /* - * Fall through - */ - case AST_Decl::NT_interface: - return AST_Interface::narrow_from_decl (d); - case AST_Decl::NT_valuetype: - return AST_ValueType::narrow_from_decl (d); - case AST_Decl::NT_eventtype: - return AST_EventType::narrow_from_decl (d); - case AST_Decl::NT_component: - return AST_Component::narrow_from_decl (d); - case AST_Decl::NT_porttype: - return AST_PortType::narrow_from_decl (d); - case AST_Decl::NT_home: - return AST_Home::narrow_from_decl (d); - case AST_Decl::NT_module: - return AST_Module::narrow_from_decl (d); - case AST_Decl::NT_root: - return AST_Root::narrow_from_decl (d); - case AST_Decl::NT_except: - return AST_Exception::narrow_from_decl (d); - case AST_Decl::NT_union: - return AST_Union::narrow_from_decl (d); - case AST_Decl::NT_struct: - return AST_Structure::narrow_from_decl (d); - case AST_Decl::NT_enum: - return AST_Enum::narrow_from_decl (d); - case AST_Decl::NT_op: - return AST_Operation::narrow_from_decl (d); - case AST_Decl::NT_factory: - return AST_Factory::narrow_from_decl (d); - default: - return 0; - } + if (d == 0) + { + return 0; + } + + switch (d->node_type ()) + { + case AST_Decl::NT_interface_fwd: + /* + * Resolve forward declared interface by looking at full_definition() + * field and iterating + */ + d = (AST_InterfaceFwd::narrow_from_decl (d))->full_definition (); + /* + * Fall through + */ + case AST_Decl::NT_interface: + return AST_Interface::narrow_from_decl (d); + case AST_Decl::NT_valuetype: + return AST_ValueType::narrow_from_decl (d); + case AST_Decl::NT_eventtype: + return AST_EventType::narrow_from_decl (d); + case AST_Decl::NT_component: + return AST_Component::narrow_from_decl (d); + case AST_Decl::NT_porttype: + return AST_PortType::narrow_from_decl (d); + case AST_Decl::NT_home: + return AST_Home::narrow_from_decl (d); + case AST_Decl::NT_module: + return AST_Module::narrow_from_decl (d); + case AST_Decl::NT_root: + return AST_Root::narrow_from_decl (d); + case AST_Decl::NT_except: + return AST_Exception::narrow_from_decl (d); + case AST_Decl::NT_union: + return AST_Union::narrow_from_decl (d); + case AST_Decl::NT_struct: + return AST_Structure::narrow_from_decl (d); + case AST_Decl::NT_enum: + return AST_Enum::narrow_from_decl (d); + case AST_Decl::NT_op: + return AST_Operation::narrow_from_decl (d); + case AST_Decl::NT_factory: + return AST_Factory::narrow_from_decl (d); + case AST_Decl::NT_finder: + return AST_Finder::narrow_from_decl (d); + default: + return 0; + } } diff --git a/TAO/TAO_IDL/util/utl_decllist.cpp b/TAO/TAO_IDL/util/utl_decllist.cpp index 2afa0aeddde..0dc139ff8e3 100644 --- a/TAO/TAO_IDL/util/utl_decllist.cpp +++ b/TAO/TAO_IDL/util/utl_decllist.cpp @@ -77,10 +77,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "utl_decllist.h" #include "fe_declarator.h" -ACE_RCSID (util, - utl_decllist, - "$Id$") - /* * Constructor(s) */ diff --git a/TAO/TAO_IDL/util/utl_identifier.cpp b/TAO/TAO_IDL/util/utl_identifier.cpp index 55f8e6a0d6d..2829ee62d9e 100644 --- a/TAO/TAO_IDL/util/utl_identifier.cpp +++ b/TAO/TAO_IDL/util/utl_identifier.cpp @@ -73,10 +73,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. // FUZZ: disable check_for_streams_include #include "ace/streams.h" -ACE_RCSID (util, - utl_identifier, - "$Id$") - Identifier::Identifier (void) : pv_string (0), escaped_ (false) diff --git a/TAO/TAO_IDL/util/utl_scope.cpp b/TAO/TAO_IDL/util/utl_scope.cpp index ec5dabfb5e2..581638442b6 100644 --- a/TAO/TAO_IDL/util/utl_scope.cpp +++ b/TAO/TAO_IDL/util/utl_scope.cpp @@ -296,63 +296,6 @@ UTL_Scope::~UTL_Scope (void) { } -// Private operations. - -static AST_Decl * -add_type (AST_Type *type) -{ - AST_Decl *result = 0; - UTL_Scope *scope = 0; - - switch (type->node_type()) - { - case AST_Decl::NT_array: - result = - idl_global->root ()->add_array (AST_Array::narrow_from_decl (type)); - break; - case AST_Decl::NT_enum: - result = - type->defined_in ()->add_enum (AST_Enum::narrow_from_decl (type)); - scope = AST_Enum::narrow_from_decl (type); - break; - case AST_Decl::NT_sequence: - result = - idl_global->root ()->add_sequence ( - AST_Sequence::narrow_from_decl (type) - ); - break; - case AST_Decl::NT_string: - case AST_Decl::NT_wstring: - result = - idl_global->root ()->add_string (AST_String::narrow_from_decl (type)); - break; - case AST_Decl::NT_struct: - result = - type->defined_in ()->add_structure ( - AST_Structure::narrow_from_decl (type) - ); - scope = AST_Structure::narrow_from_decl (type); - break; - case AST_Decl::NT_union: - result = - type->defined_in ()->add_union (AST_Union::narrow_from_decl (type)); - scope = AST_Union::narrow_from_decl (type); - break; - default: - // For non-complex types, like predefined types - // no additional add needed, assume everything is ok. - result = (AST_Decl *) 1; - break; - } - - if (scope != 0) - { - result = scope->call_add (); - } - - return result; -} - // Protected operations. // Special version of lookup which only looks at the local name instead of @@ -581,460 +524,6 @@ UTL_Scope::check_for_predef_seq (AST_Decl *d) // Public operations. -// Scope Management Protocol. -// -// All members of the protocol defined in UTL_Scope simply return the node -// and don't do a thing. These members are simply dummies to retain -// compatibility with pre-two-pass compiler back-ends. - -AST_PredefinedType * -UTL_Scope::add_predefined_type (AST_PredefinedType *p) -{ - if (p == 0) - { - return 0; - } - - p->set_added (true); - return p; -} - -AST_Module * -UTL_Scope::add_module (AST_Module *m) -{ - if (m == 0) - { - return 0; - } - - m->set_added (true); - return m; -} - -AST_Interface * -UTL_Scope::add_interface (AST_Interface *i) -{ - if (i == 0) - { - return 0; - } - - i->set_added (true); - return i; -} - -AST_InterfaceFwd * -UTL_Scope::add_interface_fwd (AST_InterfaceFwd *i) -{ - if (i == 0) - { - return 0; - } - - i->set_added (true); - return i; -} - -AST_ValueType * -UTL_Scope::add_valuetype (AST_ValueType *i) -{ - if (i == 0) - { - return 0; - } - - i->set_added (true); - return i; -} - -AST_ValueTypeFwd * -UTL_Scope::add_valuetype_fwd (AST_ValueTypeFwd *i) -{ - if (i == 0) - { - return 0; - } - - i->set_added (true); - return i; -} - -AST_EventType * -UTL_Scope::add_eventtype (AST_EventType *i) -{ - if (i == 0) - { - return 0; - } - - i->set_added (true); - return i; -} - -AST_EventTypeFwd * -UTL_Scope::add_eventtype_fwd (AST_EventTypeFwd *i) -{ - if (i == 0) - { - return 0; - } - - i->set_added (true); - return i; -} - -AST_Component * -UTL_Scope::add_component (AST_Component *i) -{ - if (i == 0) - { - return 0; - } - - i->set_added (true); - return i; -} - -AST_ComponentFwd * -UTL_Scope::add_component_fwd (AST_ComponentFwd *i) -{ - if (i == 0) - { - return 0; - } - - i->set_added (true); - return i; -} - -AST_Home * -UTL_Scope::add_home (AST_Home *i) -{ - if (i == 0) - { - return 0; - } - - i->set_added (true); - return i; -} - -AST_Exception * -UTL_Scope::add_exception (AST_Exception *e) -{ - if (e == 0) - { - return 0; - } - - e->set_added (true); - return e; -} - -AST_Constant * -UTL_Scope::add_constant (AST_Constant *c) -{ - if (c == 0) - { - return 0; - } - - c->set_added (true); - return c; -} - -UTL_StrList * -UTL_Scope::add_context (UTL_StrList *c) -{ - return c; -} - -UTL_NameList * -UTL_Scope::add_exceptions (UTL_NameList *e) -{ - return e; -} - -AST_Attribute * -UTL_Scope::add_attribute (AST_Attribute *a) -{ - if (a == 0) - { - return 0; - } - - a->set_added (true); - - if (!a->field_type ()->added ()) - { - return add_type (a->field_type ()) ? a : 0; - } - else - { - return a; - } -} - -AST_Operation * -UTL_Scope::add_operation (AST_Operation *o) -{ - if (o == 0) - { - return 0; - } - - o->set_added (true); - - if (!o->return_type ()->added ()) - { - return add_type (o->return_type ()) ? o : 0; - } - else - { - return o; - } -} - -AST_Argument * -UTL_Scope::add_argument (AST_Argument *a) -{ - if (a == 0) - { - return 0; - } - - a->set_added (true); - - if (!a->field_type ()->added ()) - { - return add_type (a->field_type ()) ? a : 0; - } - else - { - return a; - } -} - -AST_Union * -UTL_Scope::add_union (AST_Union *u) -{ - if (u == 0) - { - return 0; - } - - u->set_added (true); - return u; -} - -AST_UnionFwd * -UTL_Scope::add_union_fwd (AST_UnionFwd *u) -{ - if (u == 0) - { - return 0; - } - - u->set_added (true); - return u; -} - -AST_UnionBranch * -UTL_Scope::add_union_branch (AST_UnionBranch *u) -{ - if (u == 0) - { - return 0; - } - - u->set_added (true); - - if (!u->field_type ()->added ()) - { - return add_type (u->field_type ()) ? u : 0; - } - else - { - return u; - } -} - -AST_Structure * -UTL_Scope::add_structure (AST_Structure *s) -{ - if (s == 0) - { - return 0; - } - - s->set_added (true); - return s; -} - -AST_StructureFwd * -UTL_Scope::add_structure_fwd (AST_StructureFwd *s) -{ - if (s == 0) - { - return 0; - } - - s->set_added (true); - return s; -} - -AST_Field * -UTL_Scope::add_field (AST_Field *f) -{ - if (f == 0) - { - return 0; - } - - f->set_added (true); - - if (!f->field_type ()->added ()) - { - return add_type (f->field_type ()) ? f : 0; - } - else - { - return f; - } -} - -AST_Enum * -UTL_Scope::add_enum (AST_Enum *e) -{ - if (e == 0) - { - return 0; - } - - e->set_added (true); - return e; -} - -AST_EnumVal * -UTL_Scope::add_enum_val (AST_EnumVal *e) -{ - if (e == 0) - { - return 0; - } - - e->set_added (true); - return e; -} - -AST_Typedef * -UTL_Scope::add_typedef (AST_Typedef *t) -{ - if (t == 0) - { - return 0; - } - - t->set_added (true); - if (!t->base_type ()->added ()) - { - return add_type (t->base_type ()) ? t : 0; - } - else - { - return t; - } -} - -AST_Sequence * -UTL_Scope::add_sequence (AST_Sequence *s) -{ - if (s == 0) - { - return 0; - } - - s->set_added (true); - - if (!s->base_type ()->added ()) - { - return add_type (s->base_type ()) ? s : 0; - } - else - { - return s; - } -} - -AST_String * -UTL_Scope::add_string (AST_String *s) -{ - if (s == 0) - { - return 0; - } - - s->set_added (true); - return s; -} - -AST_Array * -UTL_Scope::add_array (AST_Array *a) -{ - if (a == 0) - { - return 0; - } - - a->set_added (true); - - if (!a->base_type ()->added ()) - { - return add_type (a->base_type ()) ? a : 0; - } - else - { - return a; - } -} - -AST_Native * -UTL_Scope::add_native (AST_Native *n) -{ - if (n == 0) - { - return 0; - } - - n->set_added (true); - return n; -} - -AST_Factory * -UTL_Scope::add_factory (AST_Factory *f) -{ - // We don't invite any new types so there is nothing actually to add - if (f == 0) - { - return 0; - } - - f->set_added (true); - return f; -} - -AST_PortType * -UTL_Scope::add_porttype (AST_PortType *p) -{ - if (p == 0) - { - return 0; - } - - p->set_added (true); - return p; -} - // Protected Front End Scope Management Protocol. // // All members of the protocol defined in UTL_Scope simply return NULL @@ -1252,6 +741,12 @@ UTL_Scope::fe_add_factory (AST_Factory *) return 0; } +AST_Finder * +UTL_Scope::fe_add_finder (AST_Finder *) +{ + return 0; +} + AST_PortType * UTL_Scope::fe_add_porttype (AST_PortType *) { @@ -1306,117 +801,6 @@ UTL_Scope::fe_add_connector (AST_Connector *) return 0; } -// This is the second pass of the front end -// It calls the public add protocol on everything in scope. -// It calls the add_xx functions of the most derived AST_Node. - -AST_Decl * -UTL_Scope::call_add (void) -{ - AST_Decl *result = 0; - AST_Decl *decl = 0; - - UTL_ScopeActiveIterator i (this, - UTL_Scope::IK_decls); - UTL_Scope *scope = 0; - - while (!i.is_done ()) - { - decl = i.item (); - scope = 0; - - switch (decl->node_type ()) - { - case AST_Decl::NT_argument: - result = add_argument (AST_Argument::narrow_from_decl (decl)); - break; - case AST_Decl::NT_array: - result = add_array (AST_Array::narrow_from_decl (decl)); - break; - case AST_Decl::NT_attr: - result = add_attribute (AST_Attribute::narrow_from_decl (decl)); - break; - case AST_Decl::NT_const: - result = add_constant (AST_Constant::narrow_from_decl (decl)); - break; - case AST_Decl::NT_enum: - scope = AST_Enum::narrow_from_decl (decl); - result = add_enum (AST_Enum::narrow_from_decl (decl)); - break; - case AST_Decl::NT_enum_val: - result = add_enum_val (AST_EnumVal::narrow_from_decl (decl)); - break; - case AST_Decl::NT_except: - scope = AST_Exception::narrow_from_decl (decl); - result = add_exception (AST_Exception::narrow_from_decl (decl)); - break; - case AST_Decl::NT_field: - result = add_field (AST_Field::narrow_from_decl (decl)); - break; - case AST_Decl::NT_interface: - scope = AST_Interface::narrow_from_decl (decl); - result = add_interface (AST_Interface::narrow_from_decl (decl)); - break; - case AST_Decl::NT_interface_fwd: - result = - add_interface_fwd (AST_InterfaceFwd::narrow_from_decl (decl)); - break; - case AST_Decl::NT_module: - scope = AST_Module::narrow_from_decl (decl); - result = add_module (AST_Module::narrow_from_decl (decl)); - break; - case AST_Decl::NT_native: - result = add_native (AST_Native::narrow_from_decl (decl)); - break; - case AST_Decl::NT_op: - result = add_operation (AST_Operation::narrow_from_decl (decl)); - scope = AST_Operation::narrow_from_decl (decl); - break; - case AST_Decl::NT_pre_defined: - result = - add_predefined_type (AST_PredefinedType::narrow_from_decl (decl)); - break; - case AST_Decl::NT_sequence: - result = add_sequence (AST_Sequence::narrow_from_decl (decl)); - break; - case AST_Decl::NT_string: - case AST_Decl::NT_wstring: - result = add_string (AST_String::narrow_from_decl (decl)); - break; - case AST_Decl::NT_struct: - result = add_structure (AST_Structure::narrow_from_decl (decl)); - scope = AST_Structure::narrow_from_decl (decl); - break; - case AST_Decl::NT_typedef: - result = add_typedef (AST_Typedef::narrow_from_decl (decl)); - break; - case AST_Decl::NT_union: - result = add_union (AST_Union::narrow_from_decl (decl)); - scope = AST_Union::narrow_from_decl (decl); - break; - case AST_Decl::NT_union_branch: - result = - add_union_branch (AST_UnionBranch::narrow_from_decl (decl)); - break; - case AST_Decl::NT_factory: - result = add_factory (AST_Factory::narrow_from_decl (decl)); - scope = AST_Factory::narrow_from_decl (decl); - break; - default: - return 0; - } - - if (scope != 0) - { - scope->call_add (); - } - - i.next (); - } - - return result; -} - // Private lookup mechanism. // For dealing with lookups of 'Object' and 'TypeCode'. @@ -2264,7 +1648,6 @@ UTL_Scope::replace_scope (AST_Decl *old_decl, break; } } - } @@ -2508,8 +1891,11 @@ 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. + AST_Decl::NodeType nt = e->node_type (); + if (id->compare (*name_tmp) == true - && e->node_type () != AST_Decl::NT_module + && nt != AST_Decl::NT_module + && nt != AST_Decl::NT_param_holder && e->defined_in () == this) { idl_global->err ()->redef_error (id->get_string (), diff --git a/TAO/TAO_IDL/util/utl_stack.cpp b/TAO/TAO_IDL/util/utl_stack.cpp index 71877c2b695..aac41c094af 100644 --- a/TAO/TAO_IDL/util/utl_stack.cpp +++ b/TAO/TAO_IDL/util/utl_stack.cpp @@ -68,10 +68,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "utl_scope.h" #include "global_extern.h" -ACE_RCSID (util, - utl_stack, - "$Id$") - #undef INCREMENT #define INCREMENT 64 diff --git a/TAO/TAO_IDL/util/utl_string.cpp b/TAO/TAO_IDL/util/utl_string.cpp index e413fc8a18b..603e799b9a7 100644 --- a/TAO/TAO_IDL/util/utl_string.cpp +++ b/TAO/TAO_IDL/util/utl_string.cpp @@ -74,10 +74,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "ace/OS_NS_ctype.h" -ACE_RCSID (util, - utl_string, - "$Id$") - UTL_String::UTL_String (void) : p_str (0), c_str (0), diff --git a/TAO/TAO_IDL/util/utl_strlist.cpp b/TAO/TAO_IDL/util/utl_strlist.cpp index 004c415fd5f..c7fc4c52574 100644 --- a/TAO/TAO_IDL/util/utl_strlist.cpp +++ b/TAO/TAO_IDL/util/utl_strlist.cpp @@ -81,10 +81,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "ace/OS_Memory.h" #include "ace/OS_NS_string.h" -ACE_RCSID (util, - utl_strlist, - "$Id$") - UTL_StrList::UTL_StrList (UTL_String *s, UTL_StrList *cdr) : UTL_List(cdr), diff --git a/TAO/TAO_IDL/util/utl_tmpl/utl_decllist.cpp b/TAO/TAO_IDL/util/utl_tmpl/utl_decllist.cpp index 5718467af2a..0116602df2d 100644 --- a/TAO/TAO_IDL/util/utl_tmpl/utl_decllist.cpp +++ b/TAO/TAO_IDL/util/utl_tmpl/utl_decllist.cpp @@ -59,8 +59,6 @@ #include <idl.hh> #include <idl_extern.hh> -ACE_RCSID(utl_tmpl, utl_decllist, "$Id$") - /* * Constructor(s) */ diff --git a/TAO/TAO_IDL/util/utl_tmpl/utl_exceptlist.cpp b/TAO/TAO_IDL/util/utl_tmpl/utl_exceptlist.cpp index df8597a16e2..39d46d2d344 100644 --- a/TAO/TAO_IDL/util/utl_tmpl/utl_exceptlist.cpp +++ b/TAO/TAO_IDL/util/utl_tmpl/utl_exceptlist.cpp @@ -59,8 +59,6 @@ #include <idl.hh> #include <idl_extern.hh> -ACE_RCSID(utl_tmpl, utl_exceptlist, "$Id$") - /* * Constructor(s) */ diff --git a/TAO/TAO_IDL/util/utl_tmpl/utl_exprlist.cpp b/TAO/TAO_IDL/util/utl_tmpl/utl_exprlist.cpp index 30ed3559e2f..be8121f117b 100644 --- a/TAO/TAO_IDL/util/utl_tmpl/utl_exprlist.cpp +++ b/TAO/TAO_IDL/util/utl_tmpl/utl_exprlist.cpp @@ -59,8 +59,6 @@ #include <idl.hh> #include <idl_extern.hh> -ACE_RCSID(utl_tmpl, utl_exprlist, "$Id$") - /* * Constructor(s) */ diff --git a/TAO/TAO_IDL/util/utl_tmpl/utl_idlist.cpp b/TAO/TAO_IDL/util/utl_tmpl/utl_idlist.cpp index 3f4780aa82e..959cb5e316c 100644 --- a/TAO/TAO_IDL/util/utl_tmpl/utl_idlist.cpp +++ b/TAO/TAO_IDL/util/utl_tmpl/utl_idlist.cpp @@ -59,8 +59,6 @@ #include <idl.hh> #include <idl_extern.hh> -ACE_RCSID(utl_tmpl, utl_idlist, "$Id$") - /* * Constructor(s) */ diff --git a/TAO/TAO_IDL/util/utl_tmpl/utl_list.cpp b/TAO/TAO_IDL/util/utl_tmpl/utl_list.cpp index 3788926b7dd..eae6ae3ce14 100644 --- a/TAO/TAO_IDL/util/utl_tmpl/utl_list.cpp +++ b/TAO/TAO_IDL/util/utl_tmpl/utl_list.cpp @@ -60,8 +60,6 @@ #include <utl_list.hh> #include <bool.hh> -ACE_RCSID(utl_tmpl, utl_list, "$Id$") - /* * Constructor(s) */ diff --git a/TAO/TAO_IDL/util/utl_tmpl/utl_namelist.cpp b/TAO/TAO_IDL/util/utl_tmpl/utl_namelist.cpp index 8ce376d9c31..d85829d7f7f 100644 --- a/TAO/TAO_IDL/util/utl_tmpl/utl_namelist.cpp +++ b/TAO/TAO_IDL/util/utl_tmpl/utl_namelist.cpp @@ -59,8 +59,6 @@ #include <idl.hh> #include <idl_extern.hh> -ACE_RCSID(utl_tmpl, utl_namelist, "$Id$") - typedef UTL_List<UTL_NameList, UTL_ScopedName> _dummy_; /* diff --git a/TAO/TAO_IDL/util/utl_tmpl/utl_strlist.cpp b/TAO/TAO_IDL/util/utl_tmpl/utl_strlist.cpp index 76461aaaad2..2ed424a8cee 100644 --- a/TAO/TAO_IDL/util/utl_tmpl/utl_strlist.cpp +++ b/TAO/TAO_IDL/util/utl_tmpl/utl_strlist.cpp @@ -59,8 +59,6 @@ #include <idl.hh> #include <idl_extern.hh> -ACE_RCSID(utl_tmpl, utl_strlist, "$Id$") - /* * Constructor(s) */ |