diff options
105 files changed, 706 insertions, 3814 deletions
diff --git a/ChangeLog b/ChangeLog index d4bde830a8d..bb912170a1d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Jun 20 07:04:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * bin/MakeProjectCreator/config/global.features: + CORBA subset configurations are disabled by default + Mon Jun 19 18:03:12 UTC 2006 Martin Corino <mcorino@remedy.nl> * include/makeinclude/platform_openvms.GNU: @@ -21,7 +26,7 @@ Mon Jun 19 13:14:54 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> * tests/Hash_Map_Manager_Test.cpp (test_two_allocators): Fixed a typo. Thanks to Abdul for reporting this. - + * tests/Hash_Map_Manager_Test.cpp (test_two_allocators): Added a test for the two allocator version of ACE_Hash_Map_Manager. Thanks to Jarek for contributing this. diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp index 1d1c53d4e80..d2dbafe3da1 100644 --- a/TAO/TAO_IDL/be/be_codegen.cpp +++ b/TAO/TAO_IDL/be/be_codegen.cpp @@ -202,7 +202,7 @@ TAO_CodeGen::start_client_header (const char *fname) const char* client_hdr = BE_GlobalData::be_get_client_hdr (&idl_name_str, 1); - + idl_name_str.destroy (); // Sanity check and then print. @@ -410,7 +410,7 @@ TAO_CodeGen::start_server_header (const char *fname) const char* server_hdr = BE_GlobalData::be_get_server_hdr (&idl_name_str, 1); - + idl_name_str.destroy (); this->server_header_->print ("\n#include \"%s\"", @@ -772,7 +772,7 @@ TAO_CodeGen::start_anyop_header (const char *fname) { return 0; } - + // Retrieve the singleton instance to the outstream factory. TAO_OutStream_Factory *factory = TAO_OUTSTREAM_FACTORY::instance (); @@ -865,7 +865,7 @@ TAO_CodeGen::start_anyop_header (const char *fname) const char *anyop_hdr = BE_GlobalData::be_get_anyop_header (&idl_name_str, 1); - + idl_name_str.destroy (); ACE_CString pidl_checker (idl_name); @@ -932,7 +932,7 @@ TAO_CodeGen::start_anyop_source (const char *fname) { return 0; } - + // Retrieve the singleton instance to the outstream factory. TAO_OutStream_Factory *factory = TAO_OUTSTREAM_FACTORY::instance (); @@ -1590,8 +1590,11 @@ TAO_CodeGen::gen_stub_hdr_includes (void) // @note This header should not go first. See the discussion above // regarding non-dependent template names. - this->gen_standard_include (this->client_header_, - "tao/ORB.h"); + this->gen_cond_file_include ( + be_global->gen_orb_h_include (), + "tao/ORB.h", + this->client_header_ + ); this->gen_cond_file_include ( idl_global->operation_seen_ || idl_global->valuefactory_seen_ @@ -1703,7 +1706,7 @@ TAO_CodeGen::gen_stub_hdr_includes (void) const char *anyop_hdr = BE_GlobalData::be_get_anyop_header (&idl_name_str, 1); - + idl_name_str.destroy (); // Stripped off any scope in the name and add the @@ -2017,8 +2020,6 @@ TAO_CodeGen::gen_any_file_includes (void) stream = this->anyop_source_; this->gen_standard_include (stream, - "tao/AnyTypeCode/Any.h"); - this->gen_standard_include (stream, "tao/CDR.h"); } diff --git a/TAO/TAO_IDL/be/be_decl.cpp b/TAO/TAO_IDL/be/be_decl.cpp index a1e8c1eedf1..81b23b7d59c 100644 --- a/TAO/TAO_IDL/be/be_decl.cpp +++ b/TAO/TAO_IDL/be/be_decl.cpp @@ -74,7 +74,6 @@ be_decl::be_decl (void) cli_arg_traits_gen_ (false), srv_arg_traits_gen_ (false), srv_sarg_traits_gen_ (false), - cli_tmpl_class_gen_ (false), cli_pragma_inst_gen_ (false), cli_inarg_tmpl_class_gen_ (false), cli_inarg_pragma_inst_gen_ (false), @@ -126,7 +125,6 @@ be_decl::be_decl (AST_Decl::NodeType type, cli_arg_traits_gen_ (false), srv_arg_traits_gen_ (false), srv_sarg_traits_gen_ (false), - cli_tmpl_class_gen_ (false), cli_pragma_inst_gen_ (false), cli_inarg_tmpl_class_gen_ (false), cli_inarg_pragma_inst_gen_ (false), @@ -439,12 +437,6 @@ be_decl::srv_sarg_traits_gen (void) } bool -be_decl::cli_tmpl_class_gen (void) -{ - return this->cli_tmpl_class_gen_; -} - -bool be_decl::cli_pragma_inst_gen (void) { return this->cli_pragma_inst_gen_; @@ -704,12 +696,6 @@ be_decl::srv_sarg_traits_gen (bool val) } void -be_decl::cli_tmpl_class_gen (bool val) -{ - this->cli_tmpl_class_gen_ = val; -} - -void be_decl::cli_pragma_inst_gen (bool val) { this->cli_pragma_inst_gen_ = val; diff --git a/TAO/TAO_IDL/be/be_global.cpp b/TAO/TAO_IDL/be/be_global.cpp index 31c9aee32a7..71a426ce476 100644 --- a/TAO/TAO_IDL/be/be_global.cpp +++ b/TAO/TAO_IDL/be/be_global.cpp @@ -93,6 +93,7 @@ BE_GlobalData::BE_GlobalData (void) gen_smart_proxies_ (false), gen_inline_constants_ (true), gen_dcps_type_support_ (false), + gen_orb_h_include_ (true), lookup_strategy_ (TAO_PERFECT_HASH), void_type_ (0), ccmobject_ (0), @@ -1050,6 +1051,7 @@ BE_GlobalData::gen_inline_constants (void) const { return this->gen_inline_constants_; } + void BE_GlobalData::gen_dcps_type_support (bool val) { @@ -1063,6 +1065,18 @@ BE_GlobalData::gen_dcps_type_support (void) const } void +BE_GlobalData::gen_orb_h_include (bool val) +{ + this->gen_orb_h_include_ = val; +} + +bool +BE_GlobalData::gen_orb_h_include (void) const +{ + return this->gen_orb_h_include_; +} + +void BE_GlobalData::lookup_strategy (LOOKUP_STRATEGY s) { this->lookup_strategy_ = s; @@ -1136,30 +1150,30 @@ BE_GlobalData::destroy (void) delete [] this->anyop_output_dir_; this->anyop_output_dir_ = 0; - + if (0 != this->messaging_) { this->messaging_->destroy (); delete this->messaging_; this->messaging_ = 0; } - + if (0 != this->messaging_exceptionholder_) { this->messaging_exceptionholder_->destroy (); delete this->messaging_exceptionholder_; this->messaging_exceptionholder_ = 0; } - + if (0 != this->messaging_replyhandler_) { this->messaging_replyhandler_->destroy (); delete this->messaging_replyhandler_; this->messaging_replyhandler_ = 0; } - + if (0 != tao_cg) - { + { tao_cg->destroy (); } } @@ -1175,7 +1189,7 @@ BE_GlobalData:: void_type (void) ); this->void_type_ = AST_PredefinedType::narrow_from_decl (d); } - + return this->void_type_; } @@ -1192,18 +1206,18 @@ BE_GlobalData::ccmobject (void) ACE_NEW_RETURN (local_name, UTL_ScopedName (local_id, 0), 0); - + Identifier *module_id = 0; ACE_NEW_RETURN (module_id, Identifier ("Components"), 0); UTL_ScopedName sn (module_id, local_name); - + AST_Decl *d = idl_global->scopes ().top_non_null ()->lookup_by_name (&sn, true); - + sn.destroy (); if (0 == d) @@ -1211,12 +1225,12 @@ BE_GlobalData::ccmobject (void) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_global::ccmobject - " "lookup of CCMObject failed\n"), - 0); + 0); } this->ccmobject_ = be_interface::narrow_from_decl (d); } - + return this->ccmobject_; } @@ -1227,7 +1241,7 @@ BE_GlobalData::messaging (void) { Identifier *id = 0; UTL_ScopedName *sn = 0; - + ACE_NEW_RETURN (id, Identifier ("Messaging"), 0); @@ -1240,7 +1254,7 @@ BE_GlobalData::messaging (void) ACE_NEW_RETURN (this->messaging_, be_module (sn), 0); - + this->messaging_->set_name (sn); } @@ -1253,7 +1267,7 @@ BE_GlobalData::messaging_exceptionholder (void) if (0 == this->messaging_exceptionholder_) { Identifier *id = 0; - be_module *msg = this->messaging (); + be_module *msg = this->messaging (); idl_global->scopes ().push (msg); ACE_NEW_RETURN (id, @@ -1303,7 +1317,7 @@ BE_GlobalData::messaging_exceptionholder (void) this->messaging_exceptionholder_->set_prefix_with_typeprefix ( "omg.org" ); - + idl_global->scopes ().pop (); // Notice the interface "ReplyHandler" that it is defined in the @@ -1331,9 +1345,9 @@ BE_GlobalData::messaging_replyhandler (void) { if (0 == this->messaging_replyhandler_) { - be_module *msg = this->messaging (); + be_module *msg = this->messaging (); idl_global->scopes ().push (msg); - + Identifier *id = 0; UTL_ScopedName *local_name = 0; @@ -1380,7 +1394,7 @@ BE_GlobalData::messaging_replyhandler (void) // "Messaging" module. this->messaging_replyhandler_->set_defined_in (msg); } - + return this->messaging_replyhandler_; } @@ -1505,7 +1519,7 @@ BE_GlobalData::parse_args (long &i, char **av) av[i] )); } - + break; // = Various 'c'lient side stub file_name_endings. case 'c': @@ -1535,7 +1549,7 @@ BE_GlobalData::parse_args (long &i, char **av) av[i] )); } - + break; // = Various 's'erver side skeleton file name endings. case 's': @@ -1589,7 +1603,7 @@ BE_GlobalData::parse_args (long &i, char **av) av[i] )); } - + break; // Operation lookup strategy. // <perfect_hash>, <dynamic_hash> or <binary_search> @@ -1655,7 +1669,7 @@ BE_GlobalData::parse_args (long &i, char **av) av[i] )); } - + break; // Path for the perfect hash generator(gperf) program. Default // is $ACE_ROOT/bin/gperf. @@ -1683,7 +1697,7 @@ BE_GlobalData::parse_args (long &i, char **av) av[i] )); } - + break; // Directory where all the IDL-Compiler-Generated files are to // be kept. Default is the current directory from which the @@ -1762,7 +1776,7 @@ BE_GlobalData::parse_args (long &i, char **av) av[i] )); } - + break; case 'G': // Enable generation of ... @@ -1952,7 +1966,7 @@ BE_GlobalData::parse_args (long &i, char **av) av[i] )); } - + break; case 'S': // Suppress generation of... @@ -1969,6 +1983,10 @@ BE_GlobalData::parse_args (long &i, char **av) be_global->any_support (false); } } + else if (av[i][2] == 'o' && av[i][3] == 'r' && av[i][4] =='b' && '\0' == av[i][5]) + { + be_global->gen_orb_h_include (false); + } else if (av[i][2] == 't') { // Suppress typecode generation @@ -2028,7 +2046,7 @@ BE_GlobalData::parse_args (long &i, char **av) av[i] )); } - + break; default: ACE_ERROR (( @@ -2522,6 +2540,11 @@ BE_GlobalData::usage (void) const ACE_TEXT (" -Ssi\t\t\tsuppress generating server inline file") ACE_TEXT (" (disabled by default)\n") )); + ACE_DEBUG (( + LM_DEBUG, + ACE_TEXT (" -Sorb\t\t\tsuppress generating include of ORB.h") + ACE_TEXT (" (disabled by default)\n") + )); } AST_Generator * diff --git a/TAO/TAO_IDL/be/be_interface_fwd.cpp b/TAO/TAO_IDL/be/be_interface_fwd.cpp index cc57b19e1f4..b5fe8edb8c8 100644 --- a/TAO/TAO_IDL/be/be_interface_fwd.cpp +++ b/TAO/TAO_IDL/be/be_interface_fwd.cpp @@ -64,15 +64,6 @@ be_interface_fwd::~be_interface_fwd (void) } void -be_interface_fwd::seq_elem_tmplinst (bool val) -{ - this->be_type::seq_elem_tmplinst (val); - be_interface *fd = - be_interface::narrow_from_decl (this->full_definition ()); - fd->seq_elem_tmplinst (val); -} - -void be_interface_fwd::seen_in_sequence (bool val) { this->be_type::seen_in_sequence (val); diff --git a/TAO/TAO_IDL/be/be_sequence.cpp b/TAO/TAO_IDL/be/be_sequence.cpp index abb99acceb5..1c0d0519730 100644 --- a/TAO/TAO_IDL/be/be_sequence.cpp +++ b/TAO/TAO_IDL/be/be_sequence.cpp @@ -616,24 +616,14 @@ be_sequence::gen_base_class_name (TAO_OutStream *os, if (this->unbounded ()) { *os << "TAO::unbounded_array_sequence<" << linebreak - << be_idt << be_idt_nl - << elem->nested_type_name (ctx_scope) << "," << linebreak - << be_nl; - *os << elem->nested_type_name (ctx_scope) << "_slice," - << linebreak << be_nl - << elem->nested_type_name (ctx_scope) << "_tag" + << elem->nested_type_name (ctx_scope) << "_traits" << linebreak << be_uidt_nl << ">" << be_uidt; } else { *os << "TAO::bounded_array_sequence<" << linebreak - << be_idt << be_idt_nl - << elem->nested_type_name (ctx_scope) << "," << linebreak - << be_nl; - *os << elem->nested_type_name (ctx_scope) << "_slice," - << linebreak << be_nl - << elem->nested_type_name (ctx_scope) << "_tag," + << elem->nested_type_name (ctx_scope) << "_traits," << linebreak << be_nl << this->max_size ()->ev ()->u.ulval << linebreak << be_uidt_nl diff --git a/TAO/TAO_IDL/be/be_type.cpp b/TAO/TAO_IDL/be/be_type.cpp index baba7a99f9f..8e4ca8254b3 100644 --- a/TAO/TAO_IDL/be/be_type.cpp +++ b/TAO/TAO_IDL/be/be_type.cpp @@ -39,7 +39,6 @@ be_type::be_type (void) be_decl (), tc_name_ (0), common_varout_gen_ (false), - seq_elem_tmplinst_ (false), seen_in_sequence_ (false), seen_in_operation_ (false) { @@ -56,7 +55,6 @@ be_type::be_type (AST_Decl::NodeType nt, n), tc_name_ (0), common_varout_gen_ (false), - seq_elem_tmplinst_ (false), seen_in_sequence_ (false), seen_in_operation_ (false) { @@ -283,8 +281,7 @@ be_type::gen_common_varout (TAO_OutStream *os) { *os << "typedef" << be_idt_nl << "TAO_Out_T<" << be_idt << be_idt_nl - << this->local_name () << "," << be_nl - << this->local_name () << "_var" << be_uidt_nl + << this->local_name () << be_uidt_nl << ">" << be_uidt_nl << this->local_name () << "_out;" << be_uidt; } @@ -293,18 +290,6 @@ be_type::gen_common_varout (TAO_OutStream *os) } bool -be_type::seq_elem_tmplinst (void) const -{ - return this->seq_elem_tmplinst_; -} - -void -be_type::seq_elem_tmplinst (bool val) -{ - this->seq_elem_tmplinst_ = val; -} - -bool be_type::seen_in_sequence (void) const { return this->seen_in_sequence_; @@ -344,7 +329,7 @@ be_type::destroy (void) delete this->tc_name_; this->tc_name_ = 0; } - + this->be_decl::destroy (); } diff --git a/TAO/TAO_IDL/be/be_typedef.cpp b/TAO/TAO_IDL/be/be_typedef.cpp index 0c0274172b2..e6bc6629940 100644 --- a/TAO/TAO_IDL/be/be_typedef.cpp +++ b/TAO/TAO_IDL/be/be_typedef.cpp @@ -66,13 +66,6 @@ be_typedef::be_typedef (AST_Type *bt, } void -be_typedef::seq_elem_tmplinst (bool val) -{ - this->be_type::seq_elem_tmplinst (val); - this->primitive_base_type ()->seq_elem_tmplinst (val); -} - -void be_typedef::seen_in_sequence (bool val) { this->be_type::seen_in_sequence (val); diff --git a/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp b/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp index e46f7de89a0..ae57d9ad15d 100644 --- a/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp +++ b/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp @@ -78,12 +78,12 @@ be_visitor_arg_traits::visit_root (be_root *node) << "// Arg traits specializations." << be_nl << "namespace TAO" << be_nl << "{" << be_idt; - + if (be_global->ami_call_back ()) { int status = this->visit_valuetype (be_global->messaging_exceptionholder ()); - + if (-1 == status) { ACE_ERROR_RETURN ((LM_ERROR, @@ -163,8 +163,7 @@ be_visitor_arg_traits::visit_interface (be_interface *node) << "TAO::Objref_Traits<" << node->name () << ">"; } - *os << "," << be_nl << this->insert_policy () << " <" - << node->name () << "_ptr>" << be_uidt_nl + *os << "," << be_nl << this->insert_policy() << be_uidt_nl << ">" << be_uidt << be_uidt << be_uidt << be_uidt_nl << "{" << be_nl << "};"; @@ -253,8 +252,7 @@ be_visitor_arg_traits::visit_valuebox (be_valuebox *node) << "TAO::Value_Traits<" << node->name () << ">"; } - os << "," << be_nl << this->insert_policy() << " <" - << node->name () << "*>" << be_uidt_nl + os << "," << be_nl << this->insert_policy() << be_uidt_nl << ">" << be_uidt << be_uidt << be_uidt << be_uidt_nl << "{" << be_nl << "};"; @@ -307,8 +305,7 @@ be_visitor_arg_traits::visit_valuetype (be_valuetype *node) << "TAO::Value_Traits<" << node->name () << ">"; } - os << "," << be_nl << this->insert_policy() << " <" - << node->name () << "*>" << be_uidt_nl + os << "," << be_nl << this->insert_policy() << be_uidt_nl << ">" << be_uidt << be_uidt << be_uidt << be_uidt_nl << "{" << be_nl << "};"; @@ -423,10 +420,7 @@ be_visitor_arg_traits::visit_operation (be_operation *node) << "BD_String_" << this->S_ << "Arg_Traits_T<" << be_nl << "CORBA::" << (wide ? "W" : "") << "String_var," << be_nl << bound << "," << be_nl - << this->insert_policy () << " <" << be_idt_nl - << "ACE_OutputCDR::from_" << (wide ? "w" : "") << "string" << be_uidt_nl - << ">" - << be_uidt_nl + << this->insert_policy() << be_uidt_nl << ">" << be_uidt << be_uidt << be_uidt_nl << "{" << be_nl @@ -507,10 +501,7 @@ be_visitor_arg_traits::visit_attribute (be_attribute *node) << "BD_String_" << this->S_ << "Arg_Traits_T<" << be_nl << "CORBA::" << (wide ? "W" : "") << "String_var," << be_nl << bound << "," << be_nl - << this->insert_policy() << " <" << be_idt_nl - << "ACE_OutputCDR::from_" << (wide ? "w" : "") << "string" << be_uidt_nl - << ">" - << be_uidt_nl + << this->insert_policy() << be_uidt_nl << ">" << be_uidt << be_uidt << be_uidt_nl << "{" << be_nl @@ -583,10 +574,7 @@ be_visitor_arg_traits::visit_argument (be_argument *node) << "BD_String_" << this->S_ << "Arg_Traits_T<" << be_nl << "CORBA::" << (wide ? "W" : "") << "String_var," << be_nl << bound << "," << be_nl - << this->insert_policy() << " <" << be_idt_nl - << "ACE_OutputCDR::from_" << (wide ? "w" : "") << "string" << be_uidt_nl - << ">" - << be_uidt_nl + << this->insert_policy() << be_uidt_nl << ">" << be_uidt << be_uidt << be_uidt_nl << "{" << be_nl @@ -625,7 +613,7 @@ be_visitor_arg_traits::visit_sequence (be_sequence *node) << ": public" << be_idt << be_idt_nl << "Var_Size_" << this->S_ << "Arg_Traits_T<" << be_idt << be_idt_nl << alias->name () << "," << be_nl - << this->insert_policy() << " <" << alias->name () << ">" << be_uidt_nl + << this->insert_policy() << be_uidt_nl << ">" << be_uidt << be_uidt << be_uidt << be_uidt_nl << "{" << be_nl << "};"; @@ -744,10 +732,7 @@ be_visitor_arg_traits::visit_string (be_string *node) << be_idt << be_idt_nl << "CORBA::" << (wide ? "W" : "") << "String_var," << be_nl << bound << "," << be_nl - << this->insert_policy() << " <" << be_idt << be_idt_nl - << "ACE_OutputCDR::from_" << (wide ? "w" : "") << "string" << be_uidt_nl - << ">" - << be_uidt << be_uidt_nl + << this->insert_policy() << be_uidt_nl << ">" << be_uidt << be_uidt << be_uidt << be_uidt_nl << "{" << be_nl @@ -790,9 +775,7 @@ be_visitor_arg_traits::visit_array (be_array *node) *os << node->name () << "_forany"; - *os << "," << be_nl - << this->insert_policy() << " <" << node->name () - << "_forany" << ">"; + *os << "," << be_nl << this->insert_policy() ; *os << be_uidt_nl << ">" << be_uidt << be_uidt << be_uidt << be_uidt_nl @@ -834,7 +817,7 @@ be_visitor_arg_traits::visit_enum (be_enum *node) *os << "Basic_" << this->S_ << "Arg_Traits_T<" << be_idt << be_idt_nl << node->name () << "," << be_nl - << this->insert_policy() << " <" << node->name () << ">" << be_uidt_nl + << this->insert_policy() << be_uidt_nl << ">" << be_uidt << be_uidt << be_uidt << be_uidt_nl << "{" << be_nl << "};"; @@ -875,10 +858,9 @@ be_visitor_arg_traits::visit_structure (be_structure *node) << ": public" << be_idt << be_idt_nl; *os << (node->size_type () == AST_Type::FIXED ? "Fixed" : "Var") - << "_Size_" << this->S_ << "Arg_Traits_T<" << be_idt << be_idt_nl - << node->name () << "," << be_nl - << this->insert_policy() << " <" - << node->name () << ">" << be_uidt_nl + << "_Size_" << this->S_ << "Arg_Traits_T<" << be_idt << be_idt_nl; + + *os << "," << be_nl << this->insert_policy() << be_uidt_nl << ">" << be_uidt << be_uidt << be_uidt << be_uidt_nl << "{" << be_nl << "};"; @@ -983,9 +965,7 @@ be_visitor_arg_traits::visit_union (be_union *node) *os << (node->size_type () == AST_Type::FIXED ? "Fixed" : "Var") << "_Size_" << this->S_ << "Arg_Traits_T<" << be_idt << be_idt_nl - << node->name () << "," << be_nl - << this->insert_policy() << " <" - << node->name () << ">"; + << "," << be_nl << this->insert_policy(); *os << be_uidt_nl << ">" << be_uidt << be_uidt << be_uidt << be_uidt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp b/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp index e965d27c1db..48dd9e04ed5 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp @@ -202,7 +202,26 @@ int be_visitor_array_ch::visit_array (be_array *node) *os << be_nl << "struct " << anon_p << node->nested_type_name (scope, "_tag") - << " {};"; + << " {};" << be_nl; + + // Traits class + *os << be_nl + << "struct " << anon_p + << node->nested_type_name (scope, "_traits") << be_nl + << "{" << be_idt_nl + << "typedef " << anon_p << node->local_name () + << "_slice slice_type;" << be_nl; + *os << "typedef " << anon_p << node->local_name () + << " value_type;" << be_nl; + *os << "typedef " << anon_p << node->nested_type_name (scope, "_tag") + << " tag_type;" << be_nl +// << "static void free (slice_type * value);" << be_nl +// << "static void zero(slice_type * value);" << be_nl +// << "static slice_type * alloc (void);" << be_nl +// << "static void copy (slice_type *_tao_to, const slice_type *_tao_from);" << be_nl +// << "static slice_type * dup (const slice_type * value);" + << be_uidt_nl + << "};"; // No _var or _out class for an anonymous (non-typedef'd) array. if (td != 0) @@ -214,19 +233,14 @@ int be_visitor_array_ch::visit_array (be_array *node) *os << be_nl << be_nl << "typedef" << be_idt_nl << "TAO_VarArray_Var_T<" << be_idt << be_idt_nl - << node->local_name () << "," << be_nl - << node->local_name () << "_slice," << be_nl - << node->local_name () << "_tag" << be_uidt_nl + << node->local_name () << "_traits" << be_uidt_nl << ">" << be_uidt_nl << node->local_name () << "_var;" << be_uidt; *os << be_nl << be_nl << "typedef" << be_idt_nl << "TAO_Array_Out_T<" << be_idt << be_idt_nl - << node->local_name () << "," << be_nl - << node->local_name () << "_var," << be_nl - << node->local_name () << "_slice," << be_nl - << node->local_name () << "_tag" << be_uidt_nl + << node->local_name () << "_traits" << be_uidt_nl << ">" << be_uidt_nl << node->local_name () << "_out;" << be_uidt; } @@ -235,9 +249,7 @@ int be_visitor_array_ch::visit_array (be_array *node) *os << be_nl << be_nl << "typedef" << be_idt_nl << "TAO_FixedArray_Var_T<" << be_idt << be_idt_nl - << node->local_name () << "," << be_nl - << node->local_name () << "_slice," << be_nl - << node->local_name () << "_tag" << be_uidt_nl + << node->local_name () << "_traits" << be_uidt_nl << ">" << be_uidt_nl << node->local_name () << "_var;" << be_uidt; @@ -251,9 +263,7 @@ int be_visitor_array_ch::visit_array (be_array *node) *os << be_nl << be_nl << "typedef" << be_idt_nl << "TAO_Array_Forany_T<" << be_idt << be_idt_nl - << anon_p << node->local_name () << "," << be_nl - << anon_p << node->local_name () << "_slice," << be_nl - << anon_p << node->local_name () << "_tag" << be_uidt_nl + << anon_p << node->local_name () << "_traits" << be_uidt_nl << ">" << be_uidt_nl << anon_p << node->local_name () << "_forany;" << be_uidt; @@ -308,12 +318,6 @@ int be_visitor_array_ch::visit_array (be_array *node) *os << node->nested_type_name (scope, "_slice") << " *_tao_from" << be_uidt_nl << ");" << be_uidt << be_nl; - *os << storage_class << "void" << be_nl - << node->nested_type_name (scope, "_zero") - << " (" << be_idt << be_idt_nl; - *os << node->nested_type_name (scope, "_slice") << " *_tao_slice" - << be_uidt_nl - << ");" << be_uidt; } else { @@ -345,12 +349,6 @@ int be_visitor_array_ch::visit_array (be_array *node) *os << node->nested_type_name (scope, "_slice", "_") << " *_tao_from" << be_uidt_nl << ");" << be_uidt; - *os << storage_class << "void" << be_nl - << node->nested_type_name (scope, "_zero", "_") - << " (" << be_idt << be_idt_nl; - *os << node->nested_type_name (scope, "_slice", "_") - << " *_tao_slice" << be_uidt_nl - << ");" << be_uidt; } // Generate the endif macro. 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 27555f63f00..5f522982c20 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp @@ -228,9 +228,147 @@ int be_visitor_array_ci::visit_array (be_array *node) << be_idt << be_idt_nl << fname << "_slice * _tao_slice" << be_uidt_nl << ")" << be_uidt_nl - << "{" << be_idt_nl - << fname << "_zero (_tao_slice);" << be_uidt_nl - << "}"; + << "{" << be_idt_nl; + + unsigned long i; + unsigned long ndims = node->n_dims (); + be_array *primitive_type = 0; + + if (bt->node_type () == AST_Decl::NT_typedef) + { + // Base type of the array node is a typedef. We need to make sure that + // this typedef is not to another array type. If it is, then we cannot + // assign an array to another. We will have to invoke the underlying + // array type's copy method for every array dimension. + + // There may be more than one level of typedef. + be_type *tmp = bt; + + while (tmp->node_type () == AST_Decl::NT_typedef) + { + be_typedef *tdef = be_typedef::narrow_from_decl (tmp); + tmp = be_type::narrow_from_decl (tdef->base_type ()); + } + + primitive_type = be_array::narrow_from_decl (tmp); + } + + *os << "// Zero each individual element." << be_nl; + + // Generate nested loops for as many dimensions as there are. + for (i = 0; i < ndims; ++i) + { + // Retrieve the ith dimension value. + AST_Expression *expr = node->dims ()[i]; + + if ((expr == 0) || ((expr != 0) && (expr->ev () == 0))) + { + ACE_ERROR_RETURN ((LM_ERROR, + "(%N:%l) be_visitor_array_cs::" + "visit_array - " + "bad array dimension\n"), + -1); + } + + if (expr->ev ()->et == AST_Expression::EV_ulong) + { + // Generate a loop for each dimension. + *os << "for ( ::CORBA::ULong i" << i << " = 0; i" << i << " < " + << expr->ev ()->u.ulval << "; ++i" << i << ")" << be_idt_nl + << "{" << be_idt_nl; + } + else + { + ACE_ERROR_RETURN ((LM_ERROR, + "(%N:%l) be_visitor_array_cs::" + "visit_array - " + "bad array dimension value\n"), + -1); + } + } + + if (primitive_type) + { + // The base type is a typedef to another array type, so + // we use the base type's copy method. + *os << "// call the underlying _zero" << be_nl; + + * os << "TAO::Array_Traits< "; + + if (bt->accept (this) == -1) + { + ACE_ERROR_RETURN ((LM_ERROR, + "be_visitor_array_cs::" + "visit_array - " + "base type decl failed\n"), + -1); + } + + * os << ", "; + + if (bt->accept (this) == -1) + { + ACE_ERROR_RETURN ((LM_ERROR, + "be_visitor_array_cs::" + "visit_array - " + "base type decl failed\n"), + -1); + } + + * os << "_slice, "; + + if (bt->accept (this) == -1) + { + ACE_ERROR_RETURN ((LM_ERROR, + "be_visitor_array_cs::" + "visit_array - " + "base type decl failed\n"), + -1); + } + + * os << "_tag>::"; + + *os << "zero (_tao_slice"; + + for (i = 0; i < ndims; ++i) + { + *os << "[i" << i << "]"; + } + + *os << ");"; + } + else + { + // The base type is not a typedef to possibly another array type. In + // such a case, assign each element. + + *os << "_tao_slice"; + + for (i = 0; i < ndims; ++i) + { + *os << "[i" << i << "]"; + } + + *os << " = "; + + if (bt->accept (this) == -1) + { + ACE_ERROR_RETURN ((LM_ERROR, + "be_visitor_array_ch::" + "visit_array - " + "base type decl failed\n"), + -1); + } + + *os << " ();"; + } + + for (i = 0; i < ndims; ++i) + { + // Add closing braces as many times as the number of dimensions. + *os << be_uidt_nl << "}" << be_uidt; + } + *os << be_uidt_nl << "}"; *os << be_nl << be_nl << "ACE_INLINE" << be_nl 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 326815963b2..0dd7f2a54d2 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp @@ -289,104 +289,6 @@ int be_visitor_array_cs::visit_array (be_array *node) *os << be_uidt_nl << "}" << be_uidt; } - *os << be_uidt_nl << "}" << be_nl << be_nl; - - // zero method. - *os << "void " << be_nl; - *os << fname << "_zero (" << be_idt << be_idt_nl - << fname << "_slice * _tao_slice" << be_uidt_nl - << ")" << be_uidt_nl; - *os << "{" << be_idt_nl; - *os << "// Zero each individual element." << be_nl; - - // Generate nested loops for as many dimensions as there are. - for (i = 0; i < ndims; ++i) - { - // Retrieve the ith dimension value. - AST_Expression *expr = node->dims ()[i]; - - if ((expr == 0) || ((expr != 0) && (expr->ev () == 0))) - { - ACE_ERROR_RETURN ((LM_ERROR, - "(%N:%l) be_visitor_array_cs::" - "visit_array - " - "bad array dimension\n"), - -1); - } - - if (expr->ev ()->et == AST_Expression::EV_ulong) - { - // Generate a loop for each dimension. - *os << "for ( ::CORBA::ULong i" << i << " = 0; i" << i << " < " - << expr->ev ()->u.ulval << "; ++i" << i << ")" << be_idt_nl - << "{" << be_idt_nl; - } - else - { - ACE_ERROR_RETURN ((LM_ERROR, - "(%N:%l) be_visitor_array_cs::" - "visit_array - " - "bad array dimension value\n"), - -1); - } - } - - if (primitive_type) - { - // The base type is a typedef to another array type, so - // we use the base type's copy method. - *os << "// call the underlying _zero" << be_nl; - - if (bt->accept (this) == -1) - { - ACE_ERROR_RETURN ((LM_ERROR, - "be_visitor_array_cs::" - "visit_array - " - "base type decl failed\n"), - -1); - } - - *os << "_zero (_tao_slice"; - - for (i = 0; i < ndims; ++i) - { - *os << "[i" << i << "]"; - } - - *os << ");"; - } - else - { - // The base type is not a typedef to possibly another array type. In - // such a case, assign each element. - - *os << "_tao_slice"; - - for (i = 0; i < ndims; ++i) - { - *os << "[i" << i << "]"; - } - - *os << " = "; - - if (bt->accept (this) == -1) - { - ACE_ERROR_RETURN ((LM_ERROR, - "be_visitor_array_ch::" - "visit_array - " - "base type decl failed\n"), - -1); - } - - *os << " ();"; - } - - for (i = 0; i < ndims; ++i) - { - // Add closing braces as many times as the number of dimensions. - *os << be_uidt_nl << "}" << be_uidt; - } - *os << be_uidt_nl << "}"; AST_Decl::NodeType nt = bt->node_type (); 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 5cc70fe22a7..f8dc7f1965e 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,8 +21,8 @@ #include "be_visitor_sequence/cdr_op_ch.h" -ACE_RCSID (be_visitor_array, - cdr_op_ch, +ACE_RCSID (be_visitor_array, + cdr_op_ch, "$Id$") // *************************************************************************** @@ -72,8 +72,8 @@ be_visitor_array_cdr_op_ch::visit_array (be_array *node) // If the array is an anonymous member and if its element type // is a declaration (not a reference), we must generate code for // the declaration. - if (this->ctx_->alias () == 0 // Not a typedef. - && bt->is_child (this->ctx_->scope ())) + if (this->ctx_->alias () == 0 && // Not a typedef. + bt->is_child (this->ctx_->scope ())) { int status = 0; be_visitor_context ctx (*this->ctx_); @@ -119,7 +119,7 @@ be_visitor_array_cdr_op_ch::visit_array (be_array *node) // Generate the CDR << and >> operator declarations. *os << be_global->stub_export_macro () << " CORBA::Boolean" - << " operator<< (TAO_OutputCDR &, const "; + << " operator<< (TAO_OutputCDR &strm, const "; if (!this->ctx_->tdef ()) { @@ -128,11 +128,11 @@ be_visitor_array_cdr_op_ch::visit_array (be_array *node) *os << parent->full_name () << "::_" << node->local_name () - << "_forany &);" << be_nl; + << "_forany &_tao_array);" << be_nl; } else { - *os << node->name () << "_forany &);" << be_nl; + *os << node->name () << "_forany &_tao_array);" << be_nl; } *os << be_global->stub_export_macro () << " ::CORBA::Boolean" @@ -152,7 +152,7 @@ be_visitor_array_cdr_op_ch::visit_array (be_array *node) *os << node->name () << "_forany &);"; } - *os << be_global->core_versioning_end () << be_nl; + *os << be_nl << be_global->core_versioning_end (); node->cli_hdr_cdr_op_gen (1); return 0; 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 71f18bac4f5..effcd2e15ce 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 @@ -49,10 +49,10 @@ be_visitor_enum_any_op_cs::visit_enum (be_enum *node) TAO_OutStream *os = this->ctx_->stream (); *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; + << "// " << __FILE__ << ":" << __LINE__ << be_nl; *os << be_global->core_versioning_begin () << be_nl; - + // Since we don't generate CDR stream operators for types that // explicitly contain a local interface (at some level), we // must override these Any template class methods to avoid @@ -112,7 +112,7 @@ be_visitor_enum_any_op_cs::visit_enum (be_enum *node) << "}"; *os << be_global->core_versioning_end () << be_nl; - + node->cli_stub_any_op_gen (1); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_ch.cpp index 395390ba4fd..2ea107d883b 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,8 +18,8 @@ // // ============================================================================ -ACE_RCSID (be_visitor_enum, - cdr_op_ch, +ACE_RCSID (be_visitor_enum, + cdr_op_ch, "$Id$") @@ -53,9 +53,9 @@ be_visitor_enum_cdr_op_ch::visit_enum (be_enum *node) // generate the CDR << and >> operators *os << be_global->stub_export_macro () << " ::CORBA::Boolean" - << " operator<< (TAO_OutputCDR &, " << node->name () << ");" << be_nl; + << " operator<< (TAO_OutputCDR &strm, " << node->name () << " _tao_enumerator);" << be_nl; *os << be_global->stub_export_macro () << " ::CORBA::Boolean" - << " operator>> (TAO_InputCDR &, " << node->name () << " &);"; + << " operator>> (TAO_InputCDR &strm, " << node->name () << " &_tao_enumerator);"; *os << be_global->core_versioning_end () << be_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_cs.cpp index 71bf537308b..25de2c55f4b 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 @@ -52,14 +52,14 @@ be_visitor_enum_cdr_op_cs::visit_enum (be_enum *node) *os << be_global->core_versioning_begin () << be_nl; - *os << "::CORBA::Boolean operator<< (TAO_OutputCDR & strm, " + *os << "::CORBA::Boolean operator<< (TAO_OutputCDR &strm, " << node->name () << " _tao_enumerator)" << be_nl << "{" << be_idt_nl << "return strm << static_cast< ::CORBA::ULong> (_tao_enumerator);" << be_uidt_nl << "}" << be_nl << be_nl; - *os << "::CORBA::Boolean operator>> (TAO_InputCDR & strm, " + *os << "::CORBA::Boolean operator>> (TAO_InputCDR &strm, " << node->name () << " & _tao_enumerator)" << be_nl << "{" << be_idt_nl << "::CORBA::ULong _tao_temp = 0;" << be_nl 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 376e6244a6a..58cced06983 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp @@ -330,12 +330,14 @@ int be_visitor_exception_cs::visit_exception (be_exception *node) if (be_global->tc_support ()) { + *os << be_global->core_versioning_begin () << be_nl; *os << "// TAO extension - the virtual _type method." << be_nl; *os << "::CORBA::TypeCode_ptr " << node->name () << "::_tao_type (void) const" << be_nl; *os << "{" << be_idt_nl; *os << "return ::" << node->tc_name () << ";" << be_uidt_nl; *os << "}"; + *os << be_global->core_versioning_end () << be_nl; } // Make sure we are generating to *C.cpp regardless of the above. diff --git a/TAO/TAO_IDL/be/be_visitor_interface.cpp b/TAO/TAO_IDL/be/be_visitor_interface.cpp index 6c0aa4b1d19..bab1d145dd5 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface.cpp @@ -35,6 +35,7 @@ #include "be_helper.h" #include "be_extern.h" #include "be_util.h" +#include "be_native.h" #include "utl_identifier.h" #include "utl_exceptlist.h" #include "nr_extern.h" @@ -52,6 +53,7 @@ #include "be_visitor_operation.h" #include "be_visitor_typecode.h" #include "be_visitor_context.h" +#include "be_visitor_native.h" #include "ace/Auto_Ptr.h" #include "be_visitor_interface/interface.cpp" diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp index b387023aa1b..6619f38955d 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp @@ -228,6 +228,39 @@ be_visitor_interface::visit_constant (be_constant *node) } int +be_visitor_interface::visit_native (be_native *node) +{ + // Instantiate a visitor context with a copy of our context. This info + // will be modified based on what type of node we are visiting + be_visitor_context ctx (*this->ctx_); + ctx.node (node); + int status = 0; + + switch (this->ctx_->state ()) + { + case TAO_CodeGen::TAO_INTERFACE_CH: + { + be_visitor_native_ch visitor (&ctx); + status = node->accept (&visitor); + break; + } + default: + return 0; // nothing to be done + } + + if (status == -1) + { + ACE_ERROR_RETURN ((LM_ERROR, + "(%N:%l) be_visitor_interface::" + "visit_native - " + "failed to accept visitor\n"), + -1); + } + + return 0; +} + +int be_visitor_interface::visit_enum (be_enum *node) { // Instantiate a visitor context with a copy of our context. This info 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 0a4b34e5935..22c109595b2 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp @@ -59,6 +59,9 @@ be_visitor_interface_cs::visit_interface (be_interface *node) *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__; + *os << be_nl << be_nl; + *os << be_global->core_versioning_begin () << be_nl; + if (node->is_defined ()) { *os << be_nl << be_nl @@ -231,12 +234,12 @@ be_visitor_interface_cs::visit_interface (be_interface *node) << "}" << be_uidt; // Now we setup the immediate parents. - int n_parents = node->n_inherits (); + long n_parents = node->n_inherits (); int has_parent = 0; if (n_parents > 0) { - for (int i = 0; i < n_parents; ++i) + for (long i = 0; i < n_parents; ++i) { be_interface *inherited = be_interface::narrow_from_decl (node->inherits ()[i]); @@ -509,6 +512,8 @@ be_visitor_interface_cs::visit_interface (be_interface *node) } } + *os << be_global->core_versioning_end () << be_nl; + return 0; } 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 a205afadb11..07584895471 100644 --- a/TAO/TAO_IDL/be/be_visitor_module/module_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_module/module_ch.cpp @@ -17,8 +17,8 @@ // // ============================================================================ -ACE_RCSID (be_visitor_module, - module_ch, +ACE_RCSID (be_visitor_module, + module_ch, "$Id$") // ****************************************************** @@ -48,9 +48,11 @@ be_visitor_module_ch::visit_module (be_module *node) *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; + *os << be_global->core_versioning_begin () << be_nl; + *os << "namespace " << node->local_name () << be_nl << "{" << be_idt; - + if (be_global->gen_anyop_files ()) { aos = tao_cg->anyop_header (); @@ -58,6 +60,8 @@ be_visitor_module_ch::visit_module (be_module *node) *aos << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; + *aos << be_global->core_versioning_begin () << be_nl; + *aos << "namespace " << node->local_name () << be_nl << "{" << be_idt; } @@ -70,7 +74,7 @@ be_visitor_module_ch::visit_module (be_module *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_module_ch::" "visit_module - " - "codegen for scope failed\n"), + "codegen for scope failed\n"), -1); } @@ -86,8 +90,13 @@ be_visitor_module_ch::visit_module (be_module *node) << "// " << __FILE__ << ":" << __LINE__ << be_nl; *aos << be_nl - << "} // module " << node->name (); + << "} // module " << node->name () << be_nl; + + *aos << be_global->core_versioning_end () << be_nl; + } + *os << be_global->core_versioning_end () << be_nl; + return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_native/native_ch.cpp b/TAO/TAO_IDL/be/be_visitor_native/native_ch.cpp new file mode 100644 index 00000000000..fe378cf0664 --- /dev/null +++ b/TAO/TAO_IDL/be/be_visitor_native/native_ch.cpp @@ -0,0 +1,63 @@ +// +// $Id$ +// + +// ============================================================================ +// +// = LIBRARY +// TAO IDL +// +// = FILENAME +// enum_ch.cpp +// +// = DESCRIPTION +// Visitor generating code for Native in the client header +// +// = AUTHOR +// Johnny Willemsen +// +// ============================================================================ + +#include "be_visitor_typecode/typecode_decl.h" + +ACE_RCSID (be_visitor_native, + native_ch, + "$Id$") + + +// ******************************************************************** +// Visitor implementation for the Native type +// This one for the client header file +// ******************************************************************** + +be_visitor_native_ch::be_visitor_native_ch (be_visitor_context *ctx) + : be_visitor_scope (ctx) +{ +} + +be_visitor_native_ch::~be_visitor_native_ch (void) +{ +} + +// Visit the native_ch node and its scope. +int +be_visitor_native_ch::visit_native (be_native *node) +{ + if (node->cli_hdr_gen () || node->imported ()) + { + return 0; + } + + TAO_OutStream *os = this->ctx_->stream (); + + *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl + << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; + + const char *node_name = node->full_name (); + if (ACE_OS::strcmp (node_name, "PortableServer::ServantLocator::Cookie") == 0) + *os << "typedef void *" << node->full_name () << ";" << be_nl; + + node->cli_hdr_gen (true); + return 0; +} + 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 7764d7fc244..9442ec63130 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/buffer_type.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/buffer_type.cpp @@ -18,8 +18,8 @@ // // ============================================================================ -ACE_RCSID (be_visitor_sequence, - buffer_type, +ACE_RCSID (be_visitor_sequence, + buffer_type, "$Id$") // **************************************************************** @@ -70,7 +70,7 @@ be_visitor_sequence_buffer_type::visit_predefined_type (be_predefined_type *node { TAO_OutStream *os = this->ctx_->stream (); AST_PredefinedType::PredefinedType pt = node->pt (); - + *os << "::"; if (pt == AST_PredefinedType::PT_pseudo @@ -212,7 +212,7 @@ be_visitor_sequence_buffer_type::visit_string (be_string *node) if (node->width () == (long) sizeof (char)) { - *os << "char *"; + *os << "::CORBA::Char *"; } else { 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 c4a48dd236e..5f7d08577c2 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,8 +19,8 @@ // // ============================================================================ -ACE_RCSID (be_visitor_sequence, - cdr_op_ch, +ACE_RCSID (be_visitor_sequence, + cdr_op_ch, "$Id$") // *************************************************************************** @@ -81,16 +81,16 @@ be_visitor_sequence_cdr_op_ch::visit_sequence (be_sequence *node) *os << be_global->core_versioning_begin () << be_nl; - *os << be_nl << be_nl + *os << be_nl << be_nl << be_global->stub_export_macro () << " ::CORBA::Boolean" << " operator<< (" << be_idt << be_idt_nl - << "TAO_OutputCDR &," << be_nl - << "const " << node->name () << " &" << be_uidt_nl + << "TAO_OutputCDR &strm," << be_nl + << "const " << node->name () << " &_tao_sequence" << be_uidt_nl << ");" << be_uidt_nl; *os << be_global->stub_export_macro () << " ::CORBA::Boolean" << " operator>> (" << be_idt << be_idt_nl - << "TAO_InputCDR &," << be_nl - << node->name () << " &" << be_uidt_nl + << "TAO_InputCDR &strm," << be_nl + << node->name () << " &_tao_sequence" << be_uidt_nl << ");" << be_uidt; *os << be_global->core_versioning_end () << be_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp index 766a50a32f7..265e0b8261e 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp @@ -174,7 +174,7 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node) << ");" << be_uidt_nl; *os << node->local_name () << " (const " << node->local_name () << " &);" << be_nl; - *os << "~" << node->local_name () << " (void);"; + *os << "virtual ~" << node->local_name () << " (void);"; if (be_global->any_support () && !node->anonymous ()) { 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 8424c8b8e00..515e18c7c02 100644 --- a/TAO/TAO_IDL/be/be_visitor_structure/structure_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_structure/structure_ch.cpp @@ -61,12 +61,15 @@ int be_visitor_structure_ch::visit_structure (be_structure *node) << node->local_name () << be_nl << "{" << be_idt_nl; - // Generate the _ptr_type and _var_type typedefs. + // Generate the typedefs. *os << "typedef " << node->local_name () << "_var _var_type;" << be_nl << "typedef " << node->local_name () << "_out _out_type;" << be_nl << be_nl; + *os << "typedef " << node->local_name () << "_out _out_type;" + << be_nl << be_nl; + if (be_global->any_support ()) { *os << "static void _tao_any_destructor (void *);"; diff --git a/TAO/tao/Array_VarOut_T.h b/TAO/tao/Array_VarOut_T.h index d7d07a43f3d..2c05bc2e25a 100644 --- a/TAO/tao/Array_VarOut_T.h +++ b/TAO/tao/Array_VarOut_T.h @@ -140,7 +140,7 @@ protected: * */ template<typename array_traits> -class TAO_FixedArray_Var_T: public TAO_Array_Var_Base_T<array_traits> +class TAO_FixedArray_Var_T : public TAO_Array_Var_Base_T<array_traits> { public: typedef typename array_traits::slice_type slice_type; diff --git a/TAO/tao/EndpointPolicy.mpc b/TAO/tao/EndpointPolicy.mpc index 62d0c80c7e4..8195f0263de 100644 --- a/TAO/tao/EndpointPolicy.mpc +++ b/TAO/tao/EndpointPolicy.mpc @@ -1,5 +1,5 @@ //$Id$ -project : taolib, core, portableserver, pi { +project : taolib, core, portableserver, pi, tao_versioning_idl_defaults { sharedname = TAO_EndpointPolicy dynamicflags = TAO_ENDPOINTPOLICY_BUILD_DLL @@ -27,9 +27,14 @@ project : taolib, core, portableserver, pi { } IDL_Files { + idlflags += -GA -SS -Sci -Ge 1 -Sorb -I$(TAO_ROOT) -Wb,export_macro=TAO_EndpointPolicy_Export -Wb,export_include="tao/EndpointPolicy/EndpointPolicy_Export.h" -o EndpointPolicy + idlflags -= -Sa -St + EndpointPolicy/EndpointPolicy.pidl + EndpointPolicy/EndpointPolicyType.pidl + EndpointPolicy/IIOPEndpointValue.pidl } Pkgconfig_Files { EndpointPolicy/TAO_EndpointPolicy.pc.in - } + } } diff --git a/TAO/tao/ImR_Client.mpc b/TAO/tao/ImR_Client.mpc index e47749ec0ae..f1e52388c01 100644 --- a/TAO/tao/ImR_Client.mpc +++ b/TAO/tao/ImR_Client.mpc @@ -28,6 +28,7 @@ project : taolib, core, portableserver { } IDL_Files { + ImR_Client } Pkgconfig_Files { diff --git a/TAO/tao/PortableServer.mpc b/TAO/tao/PortableServer.mpc index 7e54166bb0f..08b64bea823 100644 --- a/TAO/tao/PortableServer.mpc +++ b/TAO/tao/PortableServer.mpc @@ -1,5 +1,5 @@ //$Id$ -project : taolib, core, core_anytypecode { +project : taolib, core, core_anytypecode, tao_versioning_idl_defaults { sharedname = TAO_PortableServer dynamicflags = TAO_PORTABLESERVER_BUILD_DLL @@ -23,6 +23,32 @@ project : taolib, core, core_anytypecode { PortableServer } + IDL_Files { + idlflags += -Gp -Gd -Ge 1 -Sci -SS -Sorb -GA -I$(TAO_ROOT) -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include="tao/PortableServer/portableserver_export.h" -Wb,pre_include="ace/pre.h" -Wb,post_include="ace/post.h" -o PortableServer + idlflags -= -Sa -St + PortableServer/AdapterActivator.pidl + PortableServer/ForwardRequest.pidl + PortableServer/IdAssignmentPolicy.pidl + PortableServer/IdUniquenessPolicy.pidl + PortableServer/ImplicitActivationPolicy.pidl + PortableServer/LifespanPolicy.pidl + PortableServer/RequestProcessingPolicy.pidl + PortableServer/ServantActivator.pidl + PortableServer/ServantLocator.pidl + PortableServer/ServantManager.pidl + PortableServer/ServantRetentionPolicy.pidl + PortableServer/ThreadPolicy.pidl + } + + IDL_Files { + idlflags += -Gp -Gd -Ge 1 -Sci -SS -Sorb -I$(TAO_ROOT) -Wb,export_macro=TAO_PortableServer_Export -Wb,export_include="tao/PortableServer/portableserver_export.h" -Wb,pre_include="ace/pre.h" -Wb,post_include="ace/post.h" -o PortableServer + idlflags -= -Sa -St + PortableServer/POAManager.pidl + PortableServer/POAManagerFactory.pidl + PortableServer/POA.pidl + PortableServer/PS_Current.pidl + } + PIDL_Files { PortableServer } diff --git a/TAO/tao/PortableServer/PortableServer.cpp b/TAO/tao/PortableServer/PortableServer.cpp index 67d92f9fdbb..ea45384c804 100644 --- a/TAO/tao/PortableServer/PortableServer.cpp +++ b/TAO/tao/PortableServer/PortableServer.cpp @@ -124,7 +124,7 @@ TAO_POA_Initializer::init (void) ace_svc_desc_RequestProcessingStrategyAOMOnlyFactoryImpl ); -#if (TAO_HAS_MINIMUM_POA == 0) +#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) ACE_Service_Config::process_directive ( ace_svc_desc_RequestProcessingStrategyDefaultServantFactoryImpl ); diff --git a/TAO/tao/PortableServer/PortableServerC.cpp b/TAO/tao/PortableServer/PortableServerC.cpp index 65b625bf850..0f3e5f7d0f5 100644 --- a/TAO/tao/PortableServer/PortableServerC.cpp +++ b/TAO/tao/PortableServer/PortableServerC.cpp @@ -26,1201 +26,28 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:291 +// be\be_codegen.cpp:282 -#include "tao/PortableServer/PortableServer.h" +#include "PortableServer.h" +#include "tao/AnyTypeCode/Null_RefCount_Policy.h" +#include "tao/AnyTypeCode/TypeCode_Constants.h" +#include "tao/AnyTypeCode/Alias_TypeCode_Static.h" +#include "tao/AnyTypeCode/String_TypeCode_Static.h" #include "tao/CDR.h" -#include "tao/ORB_Core.h" -#include "tao/Object_Argument_T.h" -#include "ace/OS_NS_string.h" - -#if defined (__BORLANDC__) -#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig -#endif /* __BORLANDC__ */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:70 - +// be\be_visitor_arg_traits.cpp:71 TAO_BEGIN_VERSIONED_NAMESPACE_DECL -// Arg traits specializations. -namespace TAO -{ -#if !defined (_PORTABLESERVER_ADAPTERACTIVATOR__ARG_TRAITS_CS_) -#define _PORTABLESERVER_ADAPTERACTIVATOR__ARG_TRAITS_CS_ - - template<> - class Arg_Traits<PortableServer::AdapterActivator> - : public - Object_Arg_Traits_T< - PortableServer::AdapterActivator_ptr, - PortableServer::AdapterActivator_var, - PortableServer::AdapterActivator_out, - TAO::Objref_Traits<PortableServer::AdapterActivator>, - TAO::Any_Insert_Policy_Stream <PortableServer::AdapterActivator_ptr> - > - { - }; - -#endif /* end #if !defined */ -} - -// TAO_IDL - Generated from -// be\be_visitor_sequence/sequence_cs.cpp:65 - -#if !defined (_PORTABLESERVER_POALIST_CS_) -#define _PORTABLESERVER_POALIST_CS_ - -PortableServer::POAList::POAList (void) -{} - -PortableServer::POAList::POAList ( - CORBA::ULong max - ) - : TAO::unbounded_object_reference_sequence< - PortableServer::POA, - PortableServer::POA_var - > - (max) -{} - -PortableServer::POAList::POAList ( - CORBA::ULong max, - CORBA::ULong length, - PortableServer::POA_ptr * buffer, - CORBA::Boolean release - ) - : TAO::unbounded_object_reference_sequence< - PortableServer::POA, - PortableServer::POA_var - > - (max, length, buffer, release) -{} - -PortableServer::POAList::POAList ( - const POAList &seq - ) - : TAO::unbounded_object_reference_sequence< - PortableServer::POA, - PortableServer::POA_var - > - (seq) -{} - -PortableServer::POAList::~POAList (void) -{} - -void PortableServer::POAList::_tao_any_destructor ( - void * _tao_void_pointer - ) -{ - POAList * _tao_tmp_pointer = - static_cast<POAList *> (_tao_void_pointer); - delete _tao_tmp_pointer; -} - -#endif /* end #if !defined */ - -// TAO_IDL - Generated from -// be\be_visitor_interface/interface_cs.cpp:60 - -// Traits specializations for PortableServer::POA. - -PortableServer::POA_ptr -TAO::Objref_Traits<PortableServer::POA>::duplicate ( - PortableServer::POA_ptr p - ) -{ - return PortableServer::POA::_duplicate (p); -} - -void -TAO::Objref_Traits<PortableServer::POA>::release ( - PortableServer::POA_ptr p - ) -{ - ::CORBA::release (p); -} - -PortableServer::POA_ptr -TAO::Objref_Traits<PortableServer::POA>::nil (void) -{ - return PortableServer::POA::_nil (); -} - -CORBA::Boolean -TAO::Objref_Traits<PortableServer::POA>::marshal ( - PortableServer::POA_ptr p, - TAO_OutputCDR & cdr - ) -{ - return CORBA::Object::marshal (p, cdr); -} - -// TAO_IDL - Generated from -// be\be_visitor_exception/exception_cs.cpp:63 - -PortableServer::POA::AdapterAlreadyExists::AdapterAlreadyExists (void) - : CORBA::UserException ( - "IDL:omg.org/PortableServer/POA/AdapterAlreadyExists:2.3", - "AdapterAlreadyExists" - ) -{ -} - -PortableServer::POA::AdapterAlreadyExists::~AdapterAlreadyExists (void) -{ -} - -PortableServer::POA::AdapterAlreadyExists::AdapterAlreadyExists (const ::PortableServer::POA::AdapterAlreadyExists &_tao_excp) - : CORBA::UserException ( - _tao_excp._rep_id (), - _tao_excp._name () - ) -{ -} - -PortableServer::POA::AdapterAlreadyExists& -PortableServer::POA::AdapterAlreadyExists::operator= (const ::PortableServer::POA::AdapterAlreadyExists &_tao_excp) -{ - this->::CORBA::UserException::operator= (_tao_excp); - return *this; -} - -void PortableServer::POA::AdapterAlreadyExists::_tao_any_destructor (void *_tao_void_pointer) -{ - AdapterAlreadyExists *_tao_tmp_pointer = - static_cast<AdapterAlreadyExists *> (_tao_void_pointer); - delete _tao_tmp_pointer; -} - -PortableServer::POA::AdapterAlreadyExists * -PortableServer::POA::AdapterAlreadyExists::_downcast (CORBA::Exception *_tao_excp) -{ - return dynamic_cast<AdapterAlreadyExists *> (_tao_excp); -} - -const PortableServer::POA::AdapterAlreadyExists * -PortableServer::POA::AdapterAlreadyExists::_downcast (CORBA::Exception const *_tao_excp) -{ - return dynamic_cast<const AdapterAlreadyExists *> (_tao_excp); -} - -CORBA::Exception *PortableServer::POA::AdapterAlreadyExists::_alloc (void) -{ - CORBA::Exception *retval = 0; - ACE_NEW_RETURN (retval, ::PortableServer::POA::AdapterAlreadyExists, 0); - return retval; -} - -CORBA::Exception * -PortableServer::POA::AdapterAlreadyExists::_tao_duplicate (void) const -{ - CORBA::Exception *result = 0; - ACE_NEW_RETURN ( - result, - ::PortableServer::POA::AdapterAlreadyExists (*this), - 0 - ); - return result; -} - -void PortableServer::POA::AdapterAlreadyExists::_raise (void) const -{ - TAO_RAISE (*this); -} - -void PortableServer::POA::AdapterAlreadyExists::_tao_encode ( - TAO_OutputCDR & - ACE_ENV_ARG_DECL - ) const -{ - ACE_THROW (CORBA::MARSHAL ()); -} - -void PortableServer::POA::AdapterAlreadyExists::_tao_decode ( - TAO_InputCDR & - ACE_ENV_ARG_DECL - ) -{ - ACE_THROW (CORBA::MARSHAL ()); -} - -// TAO extension - the virtual _type method. -CORBA::TypeCode_ptr PortableServer::POA::AdapterAlreadyExists::_tao_type (void) const -{ - return ::PortableServer::POA::_tc_AdapterAlreadyExists; -} - -// TAO_IDL - Generated from -// be\be_visitor_exception/exception_cs.cpp:63 - -PortableServer::POA::AdapterNonExistent::AdapterNonExistent (void) - : CORBA::UserException ( - "IDL:omg.org/PortableServer/POA/AdapterNonExistent:2.3", - "AdapterNonExistent" - ) -{ -} - -PortableServer::POA::AdapterNonExistent::~AdapterNonExistent (void) -{ -} - -PortableServer::POA::AdapterNonExistent::AdapterNonExistent (const ::PortableServer::POA::AdapterNonExistent &_tao_excp) - : CORBA::UserException ( - _tao_excp._rep_id (), - _tao_excp._name () - ) -{ -} - -PortableServer::POA::AdapterNonExistent& -PortableServer::POA::AdapterNonExistent::operator= (const ::PortableServer::POA::AdapterNonExistent &_tao_excp) -{ - this->::CORBA::UserException::operator= (_tao_excp); - return *this; -} - -void PortableServer::POA::AdapterNonExistent::_tao_any_destructor (void *_tao_void_pointer) -{ - AdapterNonExistent *_tao_tmp_pointer = - static_cast<AdapterNonExistent *> (_tao_void_pointer); - delete _tao_tmp_pointer; -} - -PortableServer::POA::AdapterNonExistent * -PortableServer::POA::AdapterNonExistent::_downcast (CORBA::Exception *_tao_excp) -{ - return dynamic_cast<AdapterNonExistent *> (_tao_excp); -} - -const PortableServer::POA::AdapterNonExistent * -PortableServer::POA::AdapterNonExistent::_downcast (CORBA::Exception const *_tao_excp) -{ - return dynamic_cast<const AdapterNonExistent *> (_tao_excp); -} - -CORBA::Exception *PortableServer::POA::AdapterNonExistent::_alloc (void) -{ - CORBA::Exception *retval = 0; - ACE_NEW_RETURN (retval, ::PortableServer::POA::AdapterNonExistent, 0); - return retval; -} - -CORBA::Exception * -PortableServer::POA::AdapterNonExistent::_tao_duplicate (void) const -{ - CORBA::Exception *result = 0; - ACE_NEW_RETURN ( - result, - ::PortableServer::POA::AdapterNonExistent (*this), - 0 - ); - return result; -} - -void PortableServer::POA::AdapterNonExistent::_raise (void) const -{ - TAO_RAISE (*this); -} - -void PortableServer::POA::AdapterNonExistent::_tao_encode ( - TAO_OutputCDR & - ACE_ENV_ARG_DECL - ) const -{ - ACE_THROW (CORBA::MARSHAL ()); -} - -void PortableServer::POA::AdapterNonExistent::_tao_decode ( - TAO_InputCDR & - ACE_ENV_ARG_DECL - ) -{ - ACE_THROW (CORBA::MARSHAL ()); -} - -// TAO extension - the virtual _type method. -CORBA::TypeCode_ptr PortableServer::POA::AdapterNonExistent::_tao_type (void) const -{ - return ::PortableServer::POA::_tc_AdapterNonExistent; -} - -// TAO_IDL - Generated from -// be\be_visitor_exception/exception_cs.cpp:63 - -PortableServer::POA::InvalidPolicy::InvalidPolicy (void) - : CORBA::UserException ( - "IDL:omg.org/PortableServer/POA/InvalidPolicy:2.3", - "InvalidPolicy" - ) -{ -} - -PortableServer::POA::InvalidPolicy::~InvalidPolicy (void) -{ -} - -PortableServer::POA::InvalidPolicy::InvalidPolicy (const ::PortableServer::POA::InvalidPolicy &_tao_excp) - : CORBA::UserException ( - _tao_excp._rep_id (), - _tao_excp._name () - ) -{ - this->index = _tao_excp.index; -} - -PortableServer::POA::InvalidPolicy& -PortableServer::POA::InvalidPolicy::operator= (const ::PortableServer::POA::InvalidPolicy &_tao_excp) -{ - this->::CORBA::UserException::operator= (_tao_excp); - this->index = _tao_excp.index; - return *this; -} - -void PortableServer::POA::InvalidPolicy::_tao_any_destructor (void *_tao_void_pointer) -{ - InvalidPolicy *_tao_tmp_pointer = - static_cast<InvalidPolicy *> (_tao_void_pointer); - delete _tao_tmp_pointer; -} - -PortableServer::POA::InvalidPolicy * -PortableServer::POA::InvalidPolicy::_downcast (CORBA::Exception *_tao_excp) -{ - return dynamic_cast<InvalidPolicy *> (_tao_excp); -} - -const PortableServer::POA::InvalidPolicy * -PortableServer::POA::InvalidPolicy::_downcast (CORBA::Exception const *_tao_excp) -{ - return dynamic_cast<const InvalidPolicy *> (_tao_excp); -} - -CORBA::Exception *PortableServer::POA::InvalidPolicy::_alloc (void) -{ - CORBA::Exception *retval = 0; - ACE_NEW_RETURN (retval, ::PortableServer::POA::InvalidPolicy, 0); - return retval; -} - -CORBA::Exception * -PortableServer::POA::InvalidPolicy::_tao_duplicate (void) const -{ - CORBA::Exception *result = 0; - ACE_NEW_RETURN ( - result, - ::PortableServer::POA::InvalidPolicy (*this), - 0 - ); - return result; -} - -void PortableServer::POA::InvalidPolicy::_raise (void) const -{ - TAO_RAISE (*this); -} - -void PortableServer::POA::InvalidPolicy::_tao_encode ( - TAO_OutputCDR & - ACE_ENV_ARG_DECL - ) const -{ - ACE_THROW (CORBA::MARSHAL ()); -} - -void PortableServer::POA::InvalidPolicy::_tao_decode ( - TAO_InputCDR & - ACE_ENV_ARG_DECL - ) -{ - ACE_THROW (CORBA::MARSHAL ()); -} - - - -// TAO_IDL - Generated from -// be\be_visitor_exception/exception_ctor.cpp:66 - -PortableServer::POA::InvalidPolicy::InvalidPolicy ( - CORBA::UShort _tao_index - ) - : CORBA::UserException ( - "IDL:omg.org/PortableServer/POA/InvalidPolicy:2.3", - "InvalidPolicy" - ) -{ - this->index = _tao_index; -} - -// TAO extension - the virtual _type method. -CORBA::TypeCode_ptr PortableServer::POA::InvalidPolicy::_tao_type (void) const -{ - return ::PortableServer::POA::_tc_InvalidPolicy; -} - -// TAO_IDL - Generated from -// be\be_visitor_exception/exception_cs.cpp:63 - -#if (TAO_HAS_MINIMUM_POA == 0) - -PortableServer::POA::NoServant::NoServant (void) - : CORBA::UserException ( - "IDL:omg.org/PortableServer/POA/NoServant:2.3", - "NoServant" - ) -{ -} - -PortableServer::POA::NoServant::~NoServant (void) -{ -} - -PortableServer::POA::NoServant::NoServant (const ::PortableServer::POA::NoServant &_tao_excp) - : CORBA::UserException ( - _tao_excp._rep_id (), - _tao_excp._name () - ) -{ -} - -PortableServer::POA::NoServant& -PortableServer::POA::NoServant::operator= (const ::PortableServer::POA::NoServant &_tao_excp) -{ - this->::CORBA::UserException::operator= (_tao_excp); - return *this; -} - -void PortableServer::POA::NoServant::_tao_any_destructor (void *_tao_void_pointer) -{ - NoServant *_tao_tmp_pointer = - static_cast<NoServant *> (_tao_void_pointer); - delete _tao_tmp_pointer; -} - -PortableServer::POA::NoServant * -PortableServer::POA::NoServant::_downcast (CORBA::Exception *_tao_excp) -{ - return dynamic_cast<NoServant *> (_tao_excp); -} - -const PortableServer::POA::NoServant * -PortableServer::POA::NoServant::_downcast (CORBA::Exception const *_tao_excp) -{ - return dynamic_cast<const NoServant *> (_tao_excp); -} - -CORBA::Exception *PortableServer::POA::NoServant::_alloc (void) -{ - CORBA::Exception *retval = 0; - ACE_NEW_RETURN (retval, ::PortableServer::POA::NoServant, 0); - return retval; -} - -CORBA::Exception * -PortableServer::POA::NoServant::_tao_duplicate (void) const -{ - CORBA::Exception *result = 0; - ACE_NEW_RETURN ( - result, - ::PortableServer::POA::NoServant (*this), - 0 - ); - return result; -} - -void PortableServer::POA::NoServant::_raise (void) const -{ - TAO_RAISE (*this); -} - -void PortableServer::POA::NoServant::_tao_encode ( - TAO_OutputCDR & - ACE_ENV_ARG_DECL - ) const -{ - ACE_THROW (CORBA::MARSHAL ()); -} - -void PortableServer::POA::NoServant::_tao_decode ( - TAO_InputCDR & - ACE_ENV_ARG_DECL - ) -{ - ACE_THROW (CORBA::MARSHAL ()); -} - -// TAO extension - the virtual _type method. -CORBA::TypeCode_ptr PortableServer::POA::NoServant::_tao_type (void) const -{ - return ::PortableServer::POA::_tc_NoServant; -} - -#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ - -// TAO_IDL - Generated from -// be\be_visitor_exception/exception_cs.cpp:63 - -PortableServer::POA::ObjectAlreadyActive::ObjectAlreadyActive (void) - : CORBA::UserException ( - "IDL:omg.org/PortableServer/POA/ObjectAlreadyActive:2.3", - "ObjectAlreadyActive" - ) -{ -} - -PortableServer::POA::ObjectAlreadyActive::~ObjectAlreadyActive (void) -{ -} - -PortableServer::POA::ObjectAlreadyActive::ObjectAlreadyActive (const ::PortableServer::POA::ObjectAlreadyActive &_tao_excp) - : CORBA::UserException ( - _tao_excp._rep_id (), - _tao_excp._name () - ) -{ -} - -PortableServer::POA::ObjectAlreadyActive& -PortableServer::POA::ObjectAlreadyActive::operator= (const ::PortableServer::POA::ObjectAlreadyActive &_tao_excp) -{ - this->::CORBA::UserException::operator= (_tao_excp); - return *this; -} - -void PortableServer::POA::ObjectAlreadyActive::_tao_any_destructor (void *_tao_void_pointer) -{ - ObjectAlreadyActive *_tao_tmp_pointer = - static_cast<ObjectAlreadyActive *> (_tao_void_pointer); - delete _tao_tmp_pointer; -} - -PortableServer::POA::ObjectAlreadyActive * -PortableServer::POA::ObjectAlreadyActive::_downcast (CORBA::Exception *_tao_excp) -{ - return dynamic_cast<ObjectAlreadyActive *> (_tao_excp); -} - -const PortableServer::POA::ObjectAlreadyActive * -PortableServer::POA::ObjectAlreadyActive::_downcast (CORBA::Exception const *_tao_excp) -{ - return dynamic_cast<const ObjectAlreadyActive *> (_tao_excp); -} - -CORBA::Exception *PortableServer::POA::ObjectAlreadyActive::_alloc (void) -{ - CORBA::Exception *retval = 0; - ACE_NEW_RETURN (retval, ::PortableServer::POA::ObjectAlreadyActive, 0); - return retval; -} - -CORBA::Exception * -PortableServer::POA::ObjectAlreadyActive::_tao_duplicate (void) const -{ - CORBA::Exception *result = 0; - ACE_NEW_RETURN ( - result, - ::PortableServer::POA::ObjectAlreadyActive (*this), - 0 - ); - return result; -} - -void PortableServer::POA::ObjectAlreadyActive::_raise (void) const -{ - TAO_RAISE (*this); -} - -void PortableServer::POA::ObjectAlreadyActive::_tao_encode ( - TAO_OutputCDR & - ACE_ENV_ARG_DECL - ) const -{ - ACE_THROW (CORBA::MARSHAL ()); -} - -void PortableServer::POA::ObjectAlreadyActive::_tao_decode ( - TAO_InputCDR & - ACE_ENV_ARG_DECL - ) -{ - ACE_THROW (CORBA::MARSHAL ()); -} - -// TAO extension - the virtual _type method. -CORBA::TypeCode_ptr PortableServer::POA::ObjectAlreadyActive::_tao_type (void) const -{ - return ::PortableServer::POA::_tc_ObjectAlreadyActive; -} - -// TAO_IDL - Generated from -// be\be_visitor_exception/exception_cs.cpp:63 - -PortableServer::POA::ObjectNotActive::ObjectNotActive (void) - : CORBA::UserException ( - "IDL:omg.org/PortableServer/POA/ObjectNotActive:2.3", - "ObjectNotActive" - ) -{ -} - -PortableServer::POA::ObjectNotActive::~ObjectNotActive (void) -{ -} - -PortableServer::POA::ObjectNotActive::ObjectNotActive (const ::PortableServer::POA::ObjectNotActive &_tao_excp) - : CORBA::UserException ( - _tao_excp._rep_id (), - _tao_excp._name () - ) -{ -} - -PortableServer::POA::ObjectNotActive& -PortableServer::POA::ObjectNotActive::operator= (const ::PortableServer::POA::ObjectNotActive &_tao_excp) -{ - this->::CORBA::UserException::operator= (_tao_excp); - return *this; -} - -void PortableServer::POA::ObjectNotActive::_tao_any_destructor (void *_tao_void_pointer) -{ - ObjectNotActive *_tao_tmp_pointer = - static_cast<ObjectNotActive *> (_tao_void_pointer); - delete _tao_tmp_pointer; -} - -PortableServer::POA::ObjectNotActive * -PortableServer::POA::ObjectNotActive::_downcast (CORBA::Exception *_tao_excp) -{ - return dynamic_cast<ObjectNotActive *> (_tao_excp); -} - -const PortableServer::POA::ObjectNotActive * -PortableServer::POA::ObjectNotActive::_downcast (CORBA::Exception const *_tao_excp) -{ - return dynamic_cast<const ObjectNotActive *> (_tao_excp); -} - -CORBA::Exception *PortableServer::POA::ObjectNotActive::_alloc (void) -{ - CORBA::Exception *retval = 0; - ACE_NEW_RETURN (retval, ::PortableServer::POA::ObjectNotActive, 0); - return retval; -} - -CORBA::Exception * -PortableServer::POA::ObjectNotActive::_tao_duplicate (void) const -{ - CORBA::Exception *result = 0; - ACE_NEW_RETURN ( - result, - ::PortableServer::POA::ObjectNotActive (*this), - 0 - ); - return result; -} - -void PortableServer::POA::ObjectNotActive::_raise (void) const -{ - TAO_RAISE (*this); -} - -void PortableServer::POA::ObjectNotActive::_tao_encode ( - TAO_OutputCDR & - ACE_ENV_ARG_DECL - ) const -{ - ACE_THROW (CORBA::MARSHAL ()); -} - -void PortableServer::POA::ObjectNotActive::_tao_decode ( - TAO_InputCDR & - ACE_ENV_ARG_DECL - ) -{ - ACE_THROW (CORBA::MARSHAL ()); -} - -// TAO extension - the virtual _type method. -CORBA::TypeCode_ptr PortableServer::POA::ObjectNotActive::_tao_type (void) const -{ - return ::PortableServer::POA::_tc_ObjectNotActive; -} - -// TAO_IDL - Generated from -// be\be_visitor_exception/exception_cs.cpp:63 - -PortableServer::POA::ServantAlreadyActive::ServantAlreadyActive (void) - : CORBA::UserException ( - "IDL:omg.org/PortableServer/POA/ServantAlreadyActive:2.3", - "ServantAlreadyActive" - ) -{ -} - -PortableServer::POA::ServantAlreadyActive::~ServantAlreadyActive (void) -{ -} - -PortableServer::POA::ServantAlreadyActive::ServantAlreadyActive (const ::PortableServer::POA::ServantAlreadyActive &_tao_excp) - : CORBA::UserException ( - _tao_excp._rep_id (), - _tao_excp._name () - ) -{ -} - -PortableServer::POA::ServantAlreadyActive& -PortableServer::POA::ServantAlreadyActive::operator= (const ::PortableServer::POA::ServantAlreadyActive &_tao_excp) -{ - this->::CORBA::UserException::operator= (_tao_excp); - return *this; -} - -void PortableServer::POA::ServantAlreadyActive::_tao_any_destructor (void *_tao_void_pointer) -{ - ServantAlreadyActive *_tao_tmp_pointer = - static_cast<ServantAlreadyActive *> (_tao_void_pointer); - delete _tao_tmp_pointer; -} - -PortableServer::POA::ServantAlreadyActive * -PortableServer::POA::ServantAlreadyActive::_downcast (CORBA::Exception *_tao_excp) -{ - return dynamic_cast<ServantAlreadyActive *> (_tao_excp); -} - -const PortableServer::POA::ServantAlreadyActive * -PortableServer::POA::ServantAlreadyActive::_downcast (CORBA::Exception const *_tao_excp) -{ - return dynamic_cast<const ServantAlreadyActive *> (_tao_excp); -} - -CORBA::Exception *PortableServer::POA::ServantAlreadyActive::_alloc (void) -{ - CORBA::Exception *retval = 0; - ACE_NEW_RETURN (retval, ::PortableServer::POA::ServantAlreadyActive, 0); - return retval; -} - -CORBA::Exception * -PortableServer::POA::ServantAlreadyActive::_tao_duplicate (void) const -{ - CORBA::Exception *result = 0; - ACE_NEW_RETURN ( - result, - ::PortableServer::POA::ServantAlreadyActive (*this), - 0 - ); - return result; -} - -void PortableServer::POA::ServantAlreadyActive::_raise (void) const -{ - TAO_RAISE (*this); -} - -void PortableServer::POA::ServantAlreadyActive::_tao_encode ( - TAO_OutputCDR & - ACE_ENV_ARG_DECL - ) const -{ - ACE_THROW (CORBA::MARSHAL ()); -} - -void PortableServer::POA::ServantAlreadyActive::_tao_decode ( - TAO_InputCDR & - ACE_ENV_ARG_DECL - ) -{ - ACE_THROW (CORBA::MARSHAL ()); -} - -// TAO extension - the virtual _type method. -CORBA::TypeCode_ptr PortableServer::POA::ServantAlreadyActive::_tao_type (void) const -{ - return ::PortableServer::POA::_tc_ServantAlreadyActive; -} - -// TAO_IDL - Generated from -// be\be_visitor_exception/exception_cs.cpp:63 - -PortableServer::POA::ServantNotActive::ServantNotActive (void) - : CORBA::UserException ( - "IDL:omg.org/PortableServer/POA/ServantNotActive:2.3", - "ServantNotActive" - ) -{ -} - -PortableServer::POA::ServantNotActive::~ServantNotActive (void) -{ -} - -PortableServer::POA::ServantNotActive::ServantNotActive (const ::PortableServer::POA::ServantNotActive &_tao_excp) - : CORBA::UserException ( - _tao_excp._rep_id (), - _tao_excp._name () - ) -{ -} - -PortableServer::POA::ServantNotActive& -PortableServer::POA::ServantNotActive::operator= (const ::PortableServer::POA::ServantNotActive &_tao_excp) -{ - this->::CORBA::UserException::operator= (_tao_excp); - return *this; -} - -void PortableServer::POA::ServantNotActive::_tao_any_destructor (void *_tao_void_pointer) -{ - ServantNotActive *_tao_tmp_pointer = - static_cast<ServantNotActive *> (_tao_void_pointer); - delete _tao_tmp_pointer; -} -PortableServer::POA::ServantNotActive * -PortableServer::POA::ServantNotActive::_downcast (CORBA::Exception *_tao_excp) -{ - return dynamic_cast<ServantNotActive *> (_tao_excp); -} - -const PortableServer::POA::ServantNotActive * -PortableServer::POA::ServantNotActive::_downcast (CORBA::Exception const *_tao_excp) -{ - return dynamic_cast<const ServantNotActive *> (_tao_excp); -} - -CORBA::Exception *PortableServer::POA::ServantNotActive::_alloc (void) -{ - CORBA::Exception *retval = 0; - ACE_NEW_RETURN (retval, ::PortableServer::POA::ServantNotActive, 0); - return retval; -} - -CORBA::Exception * -PortableServer::POA::ServantNotActive::_tao_duplicate (void) const -{ - CORBA::Exception *result = 0; - ACE_NEW_RETURN ( - result, - ::PortableServer::POA::ServantNotActive (*this), - 0 - ); - return result; -} -void PortableServer::POA::ServantNotActive::_raise (void) const -{ - TAO_RAISE (*this); -} - -void PortableServer::POA::ServantNotActive::_tao_encode ( - TAO_OutputCDR & - ACE_ENV_ARG_DECL - ) const -{ - ACE_THROW (CORBA::MARSHAL ()); -} - -void PortableServer::POA::ServantNotActive::_tao_decode ( - TAO_InputCDR & - ACE_ENV_ARG_DECL - ) -{ - ACE_THROW (CORBA::MARSHAL ()); -} - -// TAO extension - the virtual _type method. -CORBA::TypeCode_ptr PortableServer::POA::ServantNotActive::_tao_type (void) const -{ - return ::PortableServer::POA::_tc_ServantNotActive; -} - -// TAO_IDL - Generated from -// be\be_visitor_exception/exception_cs.cpp:63 - -PortableServer::POA::WrongAdapter::WrongAdapter (void) - : CORBA::UserException ( - "IDL:omg.org/PortableServer/POA/WrongAdapter:2.3", - "WrongAdapter" - ) -{ -} - -PortableServer::POA::WrongAdapter::~WrongAdapter (void) -{ -} - -PortableServer::POA::WrongAdapter::WrongAdapter (const ::PortableServer::POA::WrongAdapter &_tao_excp) - : CORBA::UserException ( - _tao_excp._rep_id (), - _tao_excp._name () - ) -{ -} - -PortableServer::POA::WrongAdapter& -PortableServer::POA::WrongAdapter::operator= (const ::PortableServer::POA::WrongAdapter &_tao_excp) -{ - this->::CORBA::UserException::operator= (_tao_excp); - return *this; -} - -void PortableServer::POA::WrongAdapter::_tao_any_destructor (void *_tao_void_pointer) -{ - WrongAdapter *_tao_tmp_pointer = - static_cast<WrongAdapter *> (_tao_void_pointer); - delete _tao_tmp_pointer; -} - -PortableServer::POA::WrongAdapter * -PortableServer::POA::WrongAdapter::_downcast (CORBA::Exception *_tao_excp) -{ - return dynamic_cast<WrongAdapter *> (_tao_excp); -} - -const PortableServer::POA::WrongAdapter * -PortableServer::POA::WrongAdapter::_downcast (CORBA::Exception const *_tao_excp) -{ - return dynamic_cast<const WrongAdapter *> (_tao_excp); -} - -CORBA::Exception *PortableServer::POA::WrongAdapter::_alloc (void) -{ - CORBA::Exception *retval = 0; - ACE_NEW_RETURN (retval, ::PortableServer::POA::WrongAdapter, 0); - return retval; -} - -CORBA::Exception * -PortableServer::POA::WrongAdapter::_tao_duplicate (void) const -{ - CORBA::Exception *result = 0; - ACE_NEW_RETURN ( - result, - ::PortableServer::POA::WrongAdapter (*this), - 0 - ); - return result; -} - -void PortableServer::POA::WrongAdapter::_raise (void) const -{ - TAO_RAISE (*this); -} - -void PortableServer::POA::WrongAdapter::_tao_encode ( - TAO_OutputCDR & - ACE_ENV_ARG_DECL - ) const -{ - ACE_THROW (CORBA::MARSHAL ()); -} - -void PortableServer::POA::WrongAdapter::_tao_decode ( - TAO_InputCDR & - ACE_ENV_ARG_DECL - ) -{ - ACE_THROW (CORBA::MARSHAL ()); -} - -// TAO extension - the virtual _type method. -CORBA::TypeCode_ptr PortableServer::POA::WrongAdapter::_tao_type (void) const -{ - return ::PortableServer::POA::_tc_WrongAdapter; -} - -// TAO_IDL - Generated from -// be\be_visitor_exception/exception_cs.cpp:63 - -PortableServer::POA::WrongPolicy::WrongPolicy (void) - : CORBA::UserException ( - "IDL:omg.org/PortableServer/POA/WrongPolicy:2.3", - "WrongPolicy" - ) -{ -} - -PortableServer::POA::WrongPolicy::~WrongPolicy (void) -{ -} - -PortableServer::POA::WrongPolicy::WrongPolicy (const ::PortableServer::POA::WrongPolicy &_tao_excp) - : CORBA::UserException ( - _tao_excp._rep_id (), - _tao_excp._name () - ) -{ -} - -PortableServer::POA::WrongPolicy& -PortableServer::POA::WrongPolicy::operator= (const ::PortableServer::POA::WrongPolicy &_tao_excp) -{ - this->::CORBA::UserException::operator= (_tao_excp); - return *this; -} - -void PortableServer::POA::WrongPolicy::_tao_any_destructor (void *_tao_void_pointer) -{ - WrongPolicy *_tao_tmp_pointer = - static_cast<WrongPolicy *> (_tao_void_pointer); - delete _tao_tmp_pointer; -} - -PortableServer::POA::WrongPolicy * -PortableServer::POA::WrongPolicy::_downcast (CORBA::Exception *_tao_excp) -{ - return dynamic_cast<WrongPolicy *> (_tao_excp); -} - -const PortableServer::POA::WrongPolicy * -PortableServer::POA::WrongPolicy::_downcast (CORBA::Exception const *_tao_excp) -{ - return dynamic_cast<const WrongPolicy *> (_tao_excp); -} - -CORBA::Exception *PortableServer::POA::WrongPolicy::_alloc (void) -{ - CORBA::Exception *retval = 0; - ACE_NEW_RETURN (retval, ::PortableServer::POA::WrongPolicy, 0); - return retval; -} - -CORBA::Exception * -PortableServer::POA::WrongPolicy::_tao_duplicate (void) const -{ - CORBA::Exception *result = 0; - ACE_NEW_RETURN ( - result, - ::PortableServer::POA::WrongPolicy (*this), - 0 - ); - return result; -} - -void PortableServer::POA::WrongPolicy::_raise (void) const -{ - TAO_RAISE (*this); -} - -void PortableServer::POA::WrongPolicy::_tao_encode ( - TAO_OutputCDR & - ACE_ENV_ARG_DECL - ) const -{ - ACE_THROW (CORBA::MARSHAL ()); -} - -void PortableServer::POA::WrongPolicy::_tao_decode ( - TAO_InputCDR & - ACE_ENV_ARG_DECL - ) -{ - ACE_THROW (CORBA::MARSHAL ()); -} - -// TAO extension - the virtual _type method. -CORBA::TypeCode_ptr PortableServer::POA::WrongPolicy::_tao_type (void) const -{ - return ::PortableServer::POA::_tc_WrongPolicy; -} - -PortableServer::POA::POA (void) -{} - -PortableServer::POA::~POA (void) -{} - -void -PortableServer::POA::_tao_any_destructor (void *_tao_void_pointer) -{ - POA *_tao_tmp_pointer = - static_cast<POA *> (_tao_void_pointer); - ::CORBA::release (_tao_tmp_pointer); -} - -PortableServer::POA_ptr -PortableServer::POA::_narrow ( - CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL_NOT_USED - ) -{ - return POA::_duplicate ( - dynamic_cast<POA_ptr> (_tao_objref) - ); -} - -PortableServer::POA_ptr -PortableServer::POA::_unchecked_narrow ( - CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL_NOT_USED - ) -{ - return POA::_duplicate ( - dynamic_cast<POA_ptr> (_tao_objref) - ); -} - -PortableServer::POA_ptr -PortableServer::POA::_duplicate (POA_ptr obj) -{ - if (! ::CORBA::is_nil (obj)) - { - obj->_add_ref (); - } - - return obj; -} - -void -PortableServer::POA::_tao_release (POA_ptr obj) +// Arg traits specializations. +namespace TAO { - ::CORBA::release (obj); } -CORBA::Boolean -PortableServer::POA::_is_a ( - const char *value - ACE_ENV_ARG_DECL_NOT_USED - ) -{ - if ( - !ACE_OS::strcmp ( - value, - "IDL:omg.org/PortableServer/POA:2.3" - ) || - !ACE_OS::strcmp ( - value, - "IDL:omg.org/CORBA/LocalObject:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:omg.org/CORBA/Object:1.0" - ) - ) - { - return true; // success using local knowledge - } - else - { - return false; - } -} +TAO_END_VERSIONED_NAMESPACE_DECL -const char* PortableServer::POA::_interface_repository_id (void) const -{ - return "IDL:omg.org/PortableServer/POA:2.3"; -} -CORBA::Boolean -PortableServer::POA::marshal (TAO_OutputCDR &) -{ - return false; -} -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/PortableServerC.h b/TAO/tao/PortableServer/PortableServerC.h index 80c5bdc4fcc..6c461a182f1 100644 --- a/TAO/tao/PortableServer/PortableServerC.h +++ b/TAO/tao/PortableServer/PortableServerC.h @@ -26,10 +26,10 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:153 +// be\be_codegen.cpp:154 -#ifndef _TAO_IDL_ORIG_PORTABLESERVERC_H_ -#define _TAO_IDL_ORIG_PORTABLESERVERC_H_ +#ifndef _TAO_IDL_PORTABLESERVER_PORTABLESERVERC_H_ +#define _TAO_IDL_PORTABLESERVER_PORTABLESERVERC_H_ #include /**/ "ace/pre.h" @@ -45,1437 +45,37 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/PortableServer/portableserver_export.h" +#include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" -#include "tao/Object.h" -#include "tao/Sequence_T.h" -#include "tao/Objref_VarOut_T.h" -#include "tao/Seq_Var_T.h" -#include "tao/Seq_Out_T.h" +#include "tao/Versioned_Namespace.h" -#include "tao/Policy_ForwardC.h" -#include "tao/OctetSeqC.h" -#include "tao/orb_typesC.h" -#include "tao/PortableServer/PS_ForwardC.h" -#include "tao/PortableServer/IdAssignmentPolicyC.h" -#include "tao/PortableServer/IdUniquenessPolicyC.h" -#include "tao/PortableServer/ImplicitActivationPolicyC.h" -#include "tao/PortableServer/RequestProcessingPolicyC.h" -#include "tao/PortableServer/ServantRetentionPolicyC.h" -#include "tao/PortableServer/ThreadPolicyC.h" -#include "tao/PortableServer/LifespanPolicyC.h" +#include "tao/PortableServer/POAC.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO #endif #define TAO_EXPORT_MACRO TAO_PortableServer_Export -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - -#if defined (__BORLANDC__) -#pragma option push -w-rvl -w-rch -w-ccc -w-inl -#endif /* __BORLANDC__ */ - // TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:48 - +// be\be_visitor_traits.cpp:63 TAO_BEGIN_VERSIONED_NAMESPACE_DECL -namespace PortableServer -{ - - // TAO_IDL - Generated from - // be\be_visitor_sequence/sequence_ch.cpp:101 - -#if !defined (_PORTABLESERVER_POALIST_CH_) -#define _PORTABLESERVER_POALIST_CH_ - - class POAList; - - typedef - TAO_VarSeq_Var_T< - POAList - > - POAList_var; - - typedef - TAO_Seq_Out_T< - POAList - > - POAList_out; - - class TAO_PortableServer_Export POAList - : public - TAO::unbounded_object_reference_sequence< - POA, - POA_var - > - { - public: - POAList (void); - POAList (CORBA::ULong max); - POAList ( - CORBA::ULong max, - CORBA::ULong length, - POA_ptr* buffer, - CORBA::Boolean release = false - ); - POAList (const POAList &); - ~POAList (void); - - static void _tao_any_destructor (void *); - - typedef POAList_var _var_type; - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be\be_visitor_typecode/typecode_decl.cpp:44 - - extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_POAList; - - // TAO_IDL - Generated from - // be\be_visitor_constant/constant_ch.cpp:52 - - const CORBA::PolicyType THREAD_POLICY_ID = 16U; - - // TAO_IDL - Generated from - // be\be_visitor_constant/constant_ch.cpp:52 - - const CORBA::PolicyType LIFESPAN_POLICY_ID = 17U; - - // TAO_IDL - Generated from - // be\be_visitor_constant/constant_ch.cpp:52 - - const CORBA::PolicyType ID_UNIQUENESS_POLICY_ID = 18U; - - // TAO_IDL - Generated from - // be\be_visitor_constant/constant_ch.cpp:52 - - const CORBA::PolicyType ID_ASSIGNMENT_POLICY_ID = 19U; - - // TAO_IDL - Generated from - // be\be_visitor_constant/constant_ch.cpp:52 - - const CORBA::PolicyType IMPLICIT_ACTIVATION_POLICY_ID = 20U; - - // TAO_IDL - Generated from - // be\be_visitor_constant/constant_ch.cpp:52 - - const CORBA::PolicyType SERVANT_RETENTION_POLICY_ID = 21U; - - // TAO_IDL - Generated from - // be\be_visitor_constant/constant_ch.cpp:52 - - const CORBA::PolicyType REQUEST_PROCESSING_POLICY_ID = 22U; - - // TAO_IDL - Generated from - // be\be_interface.cpp:598 - -#if !defined (_PORTABLESERVER_POAMANAGER__VAR_OUT_CH_) -#define _PORTABLESERVER_POAMANAGER__VAR_OUT_CH_ - - class POAManager; - typedef POAManager *POAManager_ptr; - - typedef - TAO_Objref_Var_T< - POAManager - > - POAManager_var; - - typedef - TAO_Objref_Out_T< - POAManager - > - POAManager_out; - -#endif /* end #if !defined */ - -#if !defined (_PORTABLESERVER_POAMANAGERFACTORY__VAR_OUT_CH_) -#define _PORTABLESERVER_POAMANAGERFACTORY__VAR_OUT_CH_ - - class POAManagerFactory; - typedef POAManagerFactory *POAManagerFactory_ptr; - - typedef - TAO_Objref_Var_T< - POAManagerFactory - > - POAManagerFactory_var; - - typedef - TAO_Objref_Out_T< - POAManagerFactory - > - POAManagerFactory_out; - -#endif /* end #if !defined */ - // TAO_IDL - Generated from - // be\be_interface.cpp:598 - -#if !defined (_PORTABLESERVER_ADAPTERACTIVATOR__VAR_OUT_CH_) -#define _PORTABLESERVER_ADAPTERACTIVATOR__VAR_OUT_CH_ - - class AdapterActivator; - typedef AdapterActivator *AdapterActivator_ptr; - - typedef - TAO_Objref_Var_T< - AdapterActivator - > - AdapterActivator_var; - - typedef - TAO_Objref_Out_T< - AdapterActivator - > - AdapterActivator_out; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be\be_interface.cpp:598 - -#if !defined (_PORTABLESERVER_SERVANTMANAGER__VAR_OUT_CH_) -#define _PORTABLESERVER_SERVANTMANAGER__VAR_OUT_CH_ - - class ServantManager; - typedef ServantManager *ServantManager_ptr; - - typedef - TAO_Objref_Var_T< - ServantManager - > - ServantManager_var; - - typedef - TAO_Objref_Out_T< - ServantManager - > - ServantManager_out; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be\be_interface.cpp:598 - -#if !defined (_PORTABLESERVER_POA__VAR_OUT_CH_) -#define _PORTABLESERVER_POA__VAR_OUT_CH_ - - class POA; - typedef POA *POA_ptr; - - typedef - TAO_Objref_Var_T< - POA - > - POA_var; - - typedef - TAO_Objref_Out_T< - POA - > - POA_out; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be\be_visitor_interface/interface_ch.cpp:54 - -#if !defined (_PORTABLESERVER_POA_CH_) -#define _PORTABLESERVER_POA_CH_ - - class TAO_PortableServer_Export POA - : public virtual CORBA::Object - { - public: - typedef POA_ptr _ptr_type; - typedef POA_var _var_type; - - // The static operations. - static POA_ptr _duplicate (POA_ptr obj); - - static void _tao_release (POA_ptr obj); - - static POA_ptr _narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ); - - static POA_ptr _unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ); - - static POA_ptr _nil (void) - { - return static_cast<POA_ptr> (0); - } - - static void _tao_any_destructor (void *); - - // TAO_IDL - Generated from - // be\be_visitor_exception/exception_ch.cpp:53 - -#if !defined (_PORTABLESERVER_POA_ADAPTERALREADYEXISTS_CH_) -#define _PORTABLESERVER_POA_ADAPTERALREADYEXISTS_CH_ - - class TAO_PortableServer_Export AdapterAlreadyExists : public CORBA::UserException - { - public: - - AdapterAlreadyExists (void); - AdapterAlreadyExists (const AdapterAlreadyExists &); - ~AdapterAlreadyExists (void); - - AdapterAlreadyExists &operator= (const AdapterAlreadyExists &); - - static void _tao_any_destructor (void *); - - static AdapterAlreadyExists *_downcast (CORBA::Exception *); - static const AdapterAlreadyExists *_downcast (CORBA::Exception const *); - - static CORBA::Exception *_alloc (void); - - virtual CORBA::Exception *_tao_duplicate (void) const; - - virtual void _raise (void) const; - - virtual void _tao_encode ( - TAO_OutputCDR & - ACE_ENV_ARG_DECL - ) const; - - virtual void _tao_decode ( - TAO_InputCDR & - ACE_ENV_ARG_DECL - ); - - // TAO_IDL - Generated from - // be\be_visitor_exception/exception_ch.cpp:129 - - virtual CORBA::TypeCode_ptr _tao_type (void) const; - }; - - // TAO_IDL - Generated from - // be\be_visitor_typecode/typecode_decl.cpp:44 - - static ::CORBA::TypeCode_ptr const _tc_AdapterAlreadyExists; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be\be_visitor_exception/exception_ch.cpp:53 - -#if !defined (_PORTABLESERVER_POA_ADAPTERNONEXISTENT_CH_) -#define _PORTABLESERVER_POA_ADAPTERNONEXISTENT_CH_ - - class TAO_PortableServer_Export AdapterNonExistent : public CORBA::UserException - { - public: - - AdapterNonExistent (void); - AdapterNonExistent (const AdapterNonExistent &); - ~AdapterNonExistent (void); - - AdapterNonExistent &operator= (const AdapterNonExistent &); - - static void _tao_any_destructor (void *); - - static AdapterNonExistent *_downcast (CORBA::Exception *); - static const AdapterNonExistent *_downcast (CORBA::Exception const *); - - static CORBA::Exception *_alloc (void); - - virtual CORBA::Exception *_tao_duplicate (void) const; - - virtual void _raise (void) const; - - virtual void _tao_encode ( - TAO_OutputCDR & - ACE_ENV_ARG_DECL - ) const; - - virtual void _tao_decode ( - TAO_InputCDR & - ACE_ENV_ARG_DECL - ); - - // TAO_IDL - Generated from - // be\be_visitor_exception/exception_ch.cpp:129 - - virtual CORBA::TypeCode_ptr _tao_type (void) const; - }; - - // TAO_IDL - Generated from - // be\be_visitor_typecode/typecode_decl.cpp:44 - - static ::CORBA::TypeCode_ptr const _tc_AdapterNonExistent; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be\be_visitor_exception/exception_ch.cpp:53 - -#if !defined (_PORTABLESERVER_POA_INVALIDPOLICY_CH_) -#define _PORTABLESERVER_POA_INVALIDPOLICY_CH_ - - class TAO_PortableServer_Export InvalidPolicy : public CORBA::UserException - { - public: - - CORBA::UShort index; - InvalidPolicy (void); - InvalidPolicy (const InvalidPolicy &); - ~InvalidPolicy (void); - - InvalidPolicy &operator= (const InvalidPolicy &); - - static void _tao_any_destructor (void *); - - static InvalidPolicy *_downcast (CORBA::Exception *); - static const InvalidPolicy *_downcast (CORBA::Exception const *); - - static CORBA::Exception *_alloc (void); - - virtual CORBA::Exception *_tao_duplicate (void) const; - - virtual void _raise (void) const; - - virtual void _tao_encode ( - TAO_OutputCDR & - ACE_ENV_ARG_DECL - ) const; - - virtual void _tao_decode ( - TAO_InputCDR & - ACE_ENV_ARG_DECL - ); - - // TAO_IDL - Generated from - // be\be_visitor_exception/exception_ctor.cpp:66 - - InvalidPolicy ( - CORBA::UShort _tao_index - ); - - // TAO_IDL - Generated from - // be\be_visitor_exception/exception_ch.cpp:129 - - virtual CORBA::TypeCode_ptr _tao_type (void) const; - }; - - // TAO_IDL - Generated from - // be\be_visitor_typecode/typecode_decl.cpp:44 - - static ::CORBA::TypeCode_ptr const _tc_InvalidPolicy; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be\be_visitor_exception/exception_ch.cpp:53 - -#if (TAO_HAS_MINIMUM_POA == 0) - -#if !defined (_PORTABLESERVER_POA_NOSERVANT_CH_) -#define _PORTABLESERVER_POA_NOSERVANT_CH_ - - class TAO_PortableServer_Export NoServant : public CORBA::UserException - { - public: - - NoServant (void); - NoServant (const NoServant &); - ~NoServant (void); - - NoServant &operator= (const NoServant &); - - static void _tao_any_destructor (void *); - - static NoServant *_downcast (CORBA::Exception *); - static const NoServant *_downcast (CORBA::Exception const *); - - static CORBA::Exception *_alloc (void); - - virtual CORBA::Exception *_tao_duplicate (void) const; - - virtual void _raise (void) const; - - virtual void _tao_encode ( - TAO_OutputCDR & - ACE_ENV_ARG_DECL - ) const; - - virtual void _tao_decode ( - TAO_InputCDR & - ACE_ENV_ARG_DECL - ); - - // TAO_IDL - Generated from - // be\be_visitor_exception/exception_ch.cpp:129 - - virtual CORBA::TypeCode_ptr _tao_type (void) const; - }; - - // TAO_IDL - Generated from - // be\be_visitor_typecode/typecode_decl.cpp:44 - - static ::CORBA::TypeCode_ptr const _tc_NoServant; - -#endif /* end #if !defined */ - -#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ - - // TAO_IDL - Generated from - // be\be_visitor_exception/exception_ch.cpp:53 - -#if !defined (_PORTABLESERVER_POA_OBJECTALREADYACTIVE_CH_) -#define _PORTABLESERVER_POA_OBJECTALREADYACTIVE_CH_ - - class TAO_PortableServer_Export ObjectAlreadyActive : public CORBA::UserException - { - public: - - ObjectAlreadyActive (void); - ObjectAlreadyActive (const ObjectAlreadyActive &); - ~ObjectAlreadyActive (void); - - ObjectAlreadyActive &operator= (const ObjectAlreadyActive &); - - static void _tao_any_destructor (void *); - - static ObjectAlreadyActive *_downcast (CORBA::Exception *); - static const ObjectAlreadyActive *_downcast (CORBA::Exception const *); - - static CORBA::Exception *_alloc (void); - - virtual CORBA::Exception *_tao_duplicate (void) const; - - virtual void _raise (void) const; - - virtual void _tao_encode ( - TAO_OutputCDR & - ACE_ENV_ARG_DECL - ) const; - - virtual void _tao_decode ( - TAO_InputCDR & - ACE_ENV_ARG_DECL - ); - - // TAO_IDL - Generated from - // be\be_visitor_exception/exception_ch.cpp:129 - - virtual CORBA::TypeCode_ptr _tao_type (void) const; - }; - - // TAO_IDL - Generated from - // be\be_visitor_typecode/typecode_decl.cpp:44 - - static ::CORBA::TypeCode_ptr const _tc_ObjectAlreadyActive; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be\be_visitor_exception/exception_ch.cpp:53 - -#if !defined (_PORTABLESERVER_POA_OBJECTNOTACTIVE_CH_) -#define _PORTABLESERVER_POA_OBJECTNOTACTIVE_CH_ - - class TAO_PortableServer_Export ObjectNotActive : public CORBA::UserException - { - public: - - ObjectNotActive (void); - ObjectNotActive (const ObjectNotActive &); - ~ObjectNotActive (void); - - ObjectNotActive &operator= (const ObjectNotActive &); - - static void _tao_any_destructor (void *); - - static ObjectNotActive *_downcast (CORBA::Exception *); - static const ObjectNotActive *_downcast (CORBA::Exception const *); - - static CORBA::Exception *_alloc (void); - - virtual CORBA::Exception *_tao_duplicate (void) const; - - virtual void _raise (void) const; - - virtual void _tao_encode ( - TAO_OutputCDR & - ACE_ENV_ARG_DECL - ) const; - - virtual void _tao_decode ( - TAO_InputCDR & - ACE_ENV_ARG_DECL - ); - - // TAO_IDL - Generated from - // be\be_visitor_exception/exception_ch.cpp:129 - - virtual CORBA::TypeCode_ptr _tao_type (void) const; - }; - - // TAO_IDL - Generated from - // be\be_visitor_typecode/typecode_decl.cpp:44 - - static ::CORBA::TypeCode_ptr const _tc_ObjectNotActive; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be\be_visitor_exception/exception_ch.cpp:53 - -#if !defined (_PORTABLESERVER_POA_SERVANTALREADYACTIVE_CH_) -#define _PORTABLESERVER_POA_SERVANTALREADYACTIVE_CH_ - - class TAO_PortableServer_Export ServantAlreadyActive : public CORBA::UserException - { - public: - - ServantAlreadyActive (void); - ServantAlreadyActive (const ServantAlreadyActive &); - ~ServantAlreadyActive (void); - - ServantAlreadyActive &operator= (const ServantAlreadyActive &); - - static void _tao_any_destructor (void *); - - static ServantAlreadyActive *_downcast (CORBA::Exception *); - static const ServantAlreadyActive *_downcast (CORBA::Exception const *); - - static CORBA::Exception *_alloc (void); - - virtual CORBA::Exception *_tao_duplicate (void) const; - - virtual void _raise (void) const; - - virtual void _tao_encode ( - TAO_OutputCDR & - ACE_ENV_ARG_DECL - ) const; - - virtual void _tao_decode ( - TAO_InputCDR & - ACE_ENV_ARG_DECL - ); - - // TAO_IDL - Generated from - // be\be_visitor_exception/exception_ch.cpp:129 - - virtual CORBA::TypeCode_ptr _tao_type (void) const; - }; - - // TAO_IDL - Generated from - // be\be_visitor_typecode/typecode_decl.cpp:44 - - static ::CORBA::TypeCode_ptr const _tc_ServantAlreadyActive; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be\be_visitor_exception/exception_ch.cpp:53 -#if !defined (_PORTABLESERVER_POA_SERVANTNOTACTIVE_CH_) -#define _PORTABLESERVER_POA_SERVANTNOTACTIVE_CH_ - - class TAO_PortableServer_Export ServantNotActive : public CORBA::UserException - { - public: - - ServantNotActive (void); - ServantNotActive (const ServantNotActive &); - ~ServantNotActive (void); - - ServantNotActive &operator= (const ServantNotActive &); - - static void _tao_any_destructor (void *); - - static ServantNotActive *_downcast (CORBA::Exception *); - static const ServantNotActive *_downcast (CORBA::Exception const *); - - static CORBA::Exception *_alloc (void); - - virtual CORBA::Exception *_tao_duplicate (void) const; - - virtual void _raise (void) const; - - virtual void _tao_encode ( - TAO_OutputCDR & - ACE_ENV_ARG_DECL - ) const; - - virtual void _tao_decode ( - TAO_InputCDR & - ACE_ENV_ARG_DECL - ); - - // TAO_IDL - Generated from - // be\be_visitor_exception/exception_ch.cpp:129 - - virtual CORBA::TypeCode_ptr _tao_type (void) const; - }; - - // TAO_IDL - Generated from - // be\be_visitor_typecode/typecode_decl.cpp:44 - - static ::CORBA::TypeCode_ptr const _tc_ServantNotActive; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be\be_visitor_exception/exception_ch.cpp:53 - -#if !defined (_PORTABLESERVER_POA_WRONGADAPTER_CH_) -#define _PORTABLESERVER_POA_WRONGADAPTER_CH_ - - class TAO_PortableServer_Export WrongAdapter : public CORBA::UserException - { - public: - - WrongAdapter (void); - WrongAdapter (const WrongAdapter &); - ~WrongAdapter (void); - - WrongAdapter &operator= (const WrongAdapter &); - - static void _tao_any_destructor (void *); - - static WrongAdapter *_downcast (CORBA::Exception *); - static const WrongAdapter *_downcast (CORBA::Exception const *); - - static CORBA::Exception *_alloc (void); - - virtual CORBA::Exception *_tao_duplicate (void) const; - - virtual void _raise (void) const; - - virtual void _tao_encode ( - TAO_OutputCDR & - ACE_ENV_ARG_DECL - ) const; - - virtual void _tao_decode ( - TAO_InputCDR & - ACE_ENV_ARG_DECL - ); - - // TAO_IDL - Generated from - // be\be_visitor_exception/exception_ch.cpp:129 - - virtual CORBA::TypeCode_ptr _tao_type (void) const; - }; - - // TAO_IDL - Generated from - // be\be_visitor_typecode/typecode_decl.cpp:44 - - static ::CORBA::TypeCode_ptr const _tc_WrongAdapter; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be\be_visitor_exception/exception_ch.cpp:53 - -#if !defined (_PORTABLESERVER_POA_WRONGPOLICY_CH_) -#define _PORTABLESERVER_POA_WRONGPOLICY_CH_ - - class TAO_PortableServer_Export WrongPolicy : public CORBA::UserException - { - public: - - WrongPolicy (void); - WrongPolicy (const WrongPolicy &); - ~WrongPolicy (void); - - WrongPolicy &operator= (const WrongPolicy &); - - static void _tao_any_destructor (void *); - - static WrongPolicy *_downcast (CORBA::Exception *); - static const WrongPolicy *_downcast (CORBA::Exception const *); - - static CORBA::Exception *_alloc (void); - - virtual CORBA::Exception *_tao_duplicate (void) const; - - virtual void _raise (void) const; - - virtual void _tao_encode ( - TAO_OutputCDR & - ACE_ENV_ARG_DECL - ) const; - - virtual void _tao_decode ( - TAO_InputCDR & - ACE_ENV_ARG_DECL - ); - - // TAO_IDL - Generated from - // be\be_visitor_exception/exception_ch.cpp:129 - - virtual CORBA::TypeCode_ptr _tao_type (void) const; - }; - - // TAO_IDL - Generated from - // be\be_visitor_typecode/typecode_decl.cpp:44 - - static ::CORBA::TypeCode_ptr const _tc_WrongPolicy; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be\be_visitor_operation/operation_ch.cpp:46 - - virtual ::PortableServer::POA_ptr create_POA ( - const char * adapter_name, - ::PortableServer::POAManager_ptr a_POAManager, - const ::CORBA::PolicyList & policies - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ::PortableServer::POA::AdapterAlreadyExists, - ::PortableServer::POA::InvalidPolicy - )) = 0; - - // TAO_IDL - Generated from - // be\be_visitor_operation/operation_ch.cpp:46 - - virtual ::PortableServer::POA_ptr find_POA ( - const char * adapter_name, - ::CORBA::Boolean activate_it - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ::PortableServer::POA::AdapterNonExistent - )) = 0; - - // TAO_IDL - Generated from - // be\be_visitor_operation/operation_ch.cpp:46 - - virtual void destroy ( - ::CORBA::Boolean etherealize_objects, - ::CORBA::Boolean wait_for_completion - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; - - // TAO_IDL - Generated from - // be\be_visitor_operation/operation_ch.cpp:46 - -#if (TAO_HAS_MINIMUM_POA == 0) - virtual ::PortableServer::ThreadPolicy_ptr create_thread_policy ( - ::PortableServer::ThreadPolicyValue value - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; -#endif /* TAO_HAS_MINIMUM_POA == 0 */ - - // TAO_IDL - Generated from - // be\be_visitor_operation/operation_ch.cpp:46 - - virtual ::PortableServer::LifespanPolicy_ptr create_lifespan_policy ( - ::PortableServer::LifespanPolicyValue value - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; - - // TAO_IDL - Generated from - // be\be_visitor_operation/operation_ch.cpp:46 - - virtual ::PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy ( - ::PortableServer::IdUniquenessPolicyValue value - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; - - // TAO_IDL - Generated from - // be\be_visitor_operation/operation_ch.cpp:46 - - virtual ::PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy ( - ::PortableServer::IdAssignmentPolicyValue value - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; - - // TAO_IDL - Generated from - // be\be_visitor_operation/operation_ch.cpp:46 - -#if (TAO_HAS_MINIMUM_POA == 0) - virtual ::PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy ( - ::PortableServer::ImplicitActivationPolicyValue value - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; -#endif /* TAO_HAS_MINIMUM_POA == 0 */ - - // TAO_IDL - Generated from - // be\be_visitor_operation/operation_ch.cpp:46 - -#if (TAO_HAS_MINIMUM_POA == 0) - virtual ::PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy ( - ::PortableServer::ServantRetentionPolicyValue value - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; -#endif /* TAO_HAS_MINIMUM_POA == 0 */ - - // TAO_IDL - Generated from - // be\be_visitor_operation/operation_ch.cpp:46 - -#if (TAO_HAS_MINIMUM_POA == 0) - virtual ::PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy ( - ::PortableServer::RequestProcessingPolicyValue value - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; -#endif /* TAO_HAS_MINIMUM_POA == 0 */ - - // TAO_IDL - Generated from - // be\be_visitor_operation/operation_ch.cpp:46 - - virtual char * the_name ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; - - // TAO_IDL - Generated from - // be\be_visitor_operation/operation_ch.cpp:46 - - virtual ::PortableServer::POA_ptr the_parent ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; - - // TAO_IDL - Generated from - // be\be_visitor_operation/operation_ch.cpp:46 - - virtual ::PortableServer::POAList * the_children ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; - - // TAO_IDL - Generated from - // be\be_visitor_operation/operation_ch.cpp:46 - - virtual ::PortableServer::POAManager_ptr the_POAManager ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; - - virtual ::PortableServer::POAManagerFactory_ptr the_POAManagerFactory ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; - - // TAO_IDL - Generated from - // be\be_visitor_operation/operation_ch.cpp:46 - -#if (TAO_HAS_MINIMUM_POA == 0) - - virtual ::PortableServer::AdapterActivator_ptr the_activator ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; - - // TAO_IDL - Generated from - // be\be_visitor_operation/operation_ch.cpp:46 - - virtual void the_activator ( - ::PortableServer::AdapterActivator_ptr the_activator - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; -#endif /* TAO_HAS_MINIMUM_POA == 0 */ - - // TAO_IDL - Generated from - // be\be_visitor_operation/operation_ch.cpp:46 - -#if (TAO_HAS_MINIMUM_POA == 0) - virtual ::PortableServer::ServantManager_ptr get_servant_manager ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ::PortableServer::POA::WrongPolicy - )) = 0; - - // TAO_IDL - Generated from - // be\be_visitor_operation/operation_ch.cpp:46 - - virtual void set_servant_manager ( - ::PortableServer::ServantManager_ptr imgr - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ::PortableServer::POA::WrongPolicy - )) = 0; -#endif /* TAO_HAS_MINIMUM_POA == 0 */ - - // TAO_IDL - Generated from - // be\be_visitor_operation/operation_ch.cpp:46 - -#if (TAO_HAS_MINIMUM_POA == 0) - - virtual ::PortableServer::Servant get_servant ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ::PortableServer::POA::NoServant, - ::PortableServer::POA::WrongPolicy - )) = 0; - - // TAO_IDL - Generated from - // be\be_visitor_operation/operation_ch.cpp:46 - - virtual void set_servant ( - ::PortableServer::Servant p_servant - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ::PortableServer::POA::WrongPolicy - )) = 0; - -#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ - - // TAO_IDL - Generated from - // be\be_visitor_operation/operation_ch.cpp:46 - - virtual ::PortableServer::ObjectId * activate_object ( - ::PortableServer::Servant p_servant - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ::PortableServer::POA::ServantAlreadyActive, - ::PortableServer::POA::WrongPolicy - )) = 0; - - // TAO_IDL - Generated from - // be\be_visitor_operation/operation_ch.cpp:46 - - virtual void activate_object_with_id ( - const ::PortableServer::ObjectId & id, - ::PortableServer::Servant p_servant - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ::PortableServer::POA::ServantAlreadyActive, - ::PortableServer::POA::ObjectAlreadyActive, - ::PortableServer::POA::WrongPolicy - )) = 0; - - // TAO_IDL - Generated from - // be\be_visitor_operation/operation_ch.cpp:46 - - virtual void deactivate_object ( - const ::PortableServer::ObjectId & oid - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ::PortableServer::POA::ObjectNotActive, - ::PortableServer::POA::WrongPolicy - )) = 0; - - // TAO_IDL - Generated from - // be\be_visitor_operation/operation_ch.cpp:46 - - virtual CORBA::Object_ptr create_reference ( - const char * intf - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ::PortableServer::POA::WrongPolicy - )) = 0; - - // TAO_IDL - Generated from - // be\be_visitor_operation/operation_ch.cpp:46 - - virtual CORBA::Object_ptr create_reference_with_id ( - const ::PortableServer::ObjectId & oid, - const char * intf - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; - - // TAO_IDL - Generated from - // be\be_visitor_operation/operation_ch.cpp:46 - - virtual ::PortableServer::ObjectId * servant_to_id ( - ::PortableServer::Servant p_servant - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ::PortableServer::POA::ServantNotActive, - ::PortableServer::POA::WrongPolicy - )) = 0; - - // TAO_IDL - Generated from - // be\be_visitor_operation/operation_ch.cpp:46 - - virtual CORBA::Object_ptr servant_to_reference ( - ::PortableServer::Servant p_servant - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ::PortableServer::POA::ServantNotActive, - ::PortableServer::POA::WrongPolicy - )) = 0; - - // TAO_IDL - Generated from - // be\be_visitor_operation/operation_ch.cpp:46 - - virtual ::PortableServer::Servant reference_to_servant ( - ::CORBA::Object_ptr reference - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ::PortableServer::POA::ObjectNotActive, - ::PortableServer::POA::WrongAdapter, - ::PortableServer::POA::WrongPolicy - )) = 0; - - // TAO_IDL - Generated from - // be\be_visitor_operation/operation_ch.cpp:46 - - virtual ::PortableServer::ObjectId * reference_to_id ( - ::CORBA::Object_ptr reference - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ::PortableServer::POA::WrongAdapter, - ::PortableServer::POA::WrongPolicy - )) = 0; - - // TAO_IDL - Generated from - // be\be_visitor_operation/operation_ch.cpp:46 - - virtual ::PortableServer::Servant id_to_servant ( - const ::PortableServer::ObjectId & oid - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ::PortableServer::POA::ObjectNotActive, - ::PortableServer::POA::WrongPolicy - )) = 0; - - // TAO_IDL - Generated from - // be\be_visitor_operation/operation_ch.cpp:46 - - virtual CORBA::Object_ptr id_to_reference ( - const ::PortableServer::ObjectId & oid - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ::PortableServer::POA::ObjectNotActive, - ::PortableServer::POA::WrongPolicy - )) = 0; - - // TAO_IDL - Generated from - // be\be_visitor_operation/operation_ch.cpp:46 - - virtual ::CORBA::OctetSeq * id ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; - - // TAO_IDL - Generated from - // be\be_visitor_interface/interface_ch.cpp:210 - - virtual CORBA::Boolean _is_a ( - const char *type_id - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ); - - virtual const char* _interface_repository_id (void) const; - virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - - protected: - // Abstract or local interface only. - POA (void); - - virtual ~POA (void); - - private: - // Private and unimplemented for concrete interfaces. - POA (const POA &); - - void operator= (const POA &); - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be\be_visitor_typecode/typecode_decl.cpp:44 - - extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_POA; - -// TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:66 - -} // module PortableServer - -// TAO_IDL - Generated from -// be\be_visitor_traits.cpp:61 // Traits specializations. namespace TAO { - -#if !defined (_PORTABLESERVER_POAMANAGER__TRAITS_) -#define _PORTABLESERVER_POAMANAGER__TRAITS_ - - template<> - struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::POAManager> - { - static ::PortableServer::POAManager_ptr duplicate ( - ::PortableServer::POAManager_ptr - ); - static void release ( - ::PortableServer::POAManager_ptr - ); - static ::PortableServer::POAManager_ptr nil (void); - static CORBA::Boolean marshal ( - ::PortableServer::POAManager_ptr p, - TAO_OutputCDR & cdr - ); - }; - -#endif /* end #if !defined */ - -#if !defined (_PORTABLESERVER_ADAPTERACTIVATOR__TRAITS_) -#define _PORTABLESERVER_ADAPTERACTIVATOR__TRAITS_ - - template<> - struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::AdapterActivator> - { - static ::PortableServer::AdapterActivator_ptr duplicate ( - ::PortableServer::AdapterActivator_ptr - ); - static void release ( - ::PortableServer::AdapterActivator_ptr - ); - static ::PortableServer::AdapterActivator_ptr nil (void); - static CORBA::Boolean marshal ( - ::PortableServer::AdapterActivator_ptr p, - TAO_OutputCDR & cdr - ); - }; - -#endif /* end #if !defined */ - -#if !defined (_PORTABLESERVER_SERVANTMANAGER__TRAITS_) -#define _PORTABLESERVER_SERVANTMANAGER__TRAITS_ - - template<> - struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::ServantManager> - { - static ::PortableServer::ServantManager_ptr duplicate ( - ::PortableServer::ServantManager_ptr - ); - static void release ( - ::PortableServer::ServantManager_ptr - ); - static ::PortableServer::ServantManager_ptr nil (void); - static CORBA::Boolean marshal ( - ::PortableServer::ServantManager_ptr p, - TAO_OutputCDR & cdr - ); - }; - -#endif /* end #if !defined */ - -#if !defined (_PORTABLESERVER_POA__TRAITS_) -#define _PORTABLESERVER_POA__TRAITS_ - - template<> - struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::POA> - { - static ::PortableServer::POA_ptr duplicate ( - ::PortableServer::POA_ptr - ); - static void release ( - ::PortableServer::POA_ptr - ); - static ::PortableServer::POA_ptr nil (void); - static CORBA::Boolean marshal ( - ::PortableServer::POA_ptr p, - TAO_OutputCDR & cdr - ); - }; - -#endif /* end #if !defined */ } - -// TAO_IDL - Generated from -// be\be_visitor_sequence/any_op_ch.cpp:52 - -TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::POAList &); // copying version -TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POAList*); // noncopying version -TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POAList *&); // deprecated -TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::POAList *&); - -// TAO_IDL - Generated from -// be\be_visitor_interface/any_op_ch.cpp:52 - -TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POA_ptr); // copying -TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POA_ptr *); // non-copying -TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POA_ptr &); - -// TAO_IDL - Generated from -// be\be_visitor_exception/any_op_ch.cpp:52 - -TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::POA::AdapterAlreadyExists &); // copying version -TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POA::AdapterAlreadyExists*); // noncopying version -TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POA::AdapterAlreadyExists *&); // deprecated -TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::POA::AdapterAlreadyExists *&); - -// TAO_IDL - Generated from -// be\be_visitor_exception/any_op_ch.cpp:52 - -TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::POA::AdapterNonExistent &); // copying version -TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POA::AdapterNonExistent*); // noncopying version -TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POA::AdapterNonExistent *&); // deprecated -TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::POA::AdapterNonExistent *&); - -// TAO_IDL - Generated from -// be\be_visitor_exception/any_op_ch.cpp:52 - -TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::POA::InvalidPolicy &); // copying version -TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POA::InvalidPolicy*); // noncopying version -TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POA::InvalidPolicy *&); // deprecated -TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::POA::InvalidPolicy *&); - -// TAO_IDL - Generated from -// be\be_visitor_exception/any_op_ch.cpp:52 - -#if (TAO_HAS_MINIMUM_POA == 0) - -TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::POA::NoServant &); // copying version -TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POA::NoServant*); // noncopying version -TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POA::NoServant *&); // deprecated -TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::POA::NoServant *&); - -#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ - -// TAO_IDL - Generated from -// be\be_visitor_exception/any_op_ch.cpp:52 - -TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::POA::ObjectAlreadyActive &); // copying version -TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POA::ObjectAlreadyActive*); // noncopying version -TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POA::ObjectAlreadyActive *&); // deprecated -TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::POA::ObjectAlreadyActive *&); - -// TAO_IDL - Generated from -// be\be_visitor_exception/any_op_ch.cpp:52 - -TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::POA::ObjectNotActive &); // copying version -TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POA::ObjectNotActive*); // noncopying version -TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POA::ObjectNotActive *&); // deprecated -TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::POA::ObjectNotActive *&); - -// TAO_IDL - Generated from -// be\be_visitor_exception/any_op_ch.cpp:52 - -TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::POA::ServantAlreadyActive &); // copying version -TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POA::ServantAlreadyActive*); // noncopying version -TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POA::ServantAlreadyActive *&); // deprecated -TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::POA::ServantAlreadyActive *&); - -// TAO_IDL - Generated from -// be\be_visitor_exception/any_op_ch.cpp:52 - -TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::POA::ServantNotActive &); // copying version -TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POA::ServantNotActive*); // noncopying version -TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POA::ServantNotActive *&); // deprecated -TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::POA::ServantNotActive *&); - -// TAO_IDL - Generated from -// be\be_visitor_exception/any_op_ch.cpp:52 - -TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::POA::WrongAdapter &); // copying version -TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POA::WrongAdapter*); // noncopying version -TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POA::WrongAdapter *&); // deprecated -TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::POA::WrongAdapter *&); - -// TAO_IDL - Generated from -// be\be_visitor_exception/any_op_ch.cpp:52 - -TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::POA::WrongPolicy &); // copying version -TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POA::WrongPolicy*); // noncopying version -TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POA::WrongPolicy *&); // deprecated -TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::POA::WrongPolicy *&); - -// TAO_IDL - Generated from -// be\be_codegen.cpp:955 - TAO_END_VERSIONED_NAMESPACE_DECL -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ -#if defined (__BORLANDC__) -#pragma option pop -#endif /* __BORLANDC__ */ +// TAO_IDL - Generated from +// be\be_codegen.cpp:1092 #include /**/ "ace/post.h" #endif /* ifndef */ + diff --git a/TAO/tao/PortableServer/PortableServerS.h b/TAO/tao/PortableServer/PortableServerS.h index acf326b7e64..17b1360599e 100644 --- a/TAO/tao/PortableServer/PortableServerS.h +++ b/TAO/tao/PortableServer/PortableServerS.h @@ -25,56 +25,4 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -// TAO_IDL - Generated from -// be\be_codegen.cpp:373 - -#ifndef _TAO_IDL_PORTABLESERVERS_H_ -#define _TAO_IDL_PORTABLESERVERS_H_ - -#include /**/ "ace/pre.h" - -#include "tao/PortableServer/PortableServerC.h" -#include "tao/Policy_ForwardS.h" -#include "tao/OctetSeqS.h" -#include "tao/orb_typesS.h" -#include "tao/PortableServer/PS_ForwardS.h" -#include "tao/PortableServer/IdAssignmentPolicyS.h" -#include "tao/PortableServer/IdUniquenessPolicyS.h" -#include "tao/PortableServer/ImplicitActivationPolicyS.h" -#include "tao/PortableServer/LifespanPolicyS.h" -#include "tao/PortableServer/RequestProcessingPolicyS.h" -#include "tao/PortableServer/ServantRetentionPolicyS.h" -#include "tao/PortableServer/ThreadPolicyS.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - - -// TAO_IDL - Generated from -// be\be_visitor_module/module_sh.cpp:49 - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace POA_PortableServer -{ - - -// TAO_IDL - Generated from -// be\be_visitor_module/module_sh.cpp:80 - -} // module PortableServer - -// TAO_IDL - Generated from -// be\be_codegen.cpp:1060 - -TAO_END_VERSIONED_NAMESPACE_DECL - - -#if defined (__ACE_INLINE__) -#include "PortableServerS.inl" -#endif /* defined INLINE */ - -#include /**/ "ace/post.h" -#endif /* ifndef */ - +// Skeleton file generation suppressed with command line option -SS diff --git a/TAO/tao/PortableServer/RequestProcessingPolicy.pidl b/TAO/tao/PortableServer/RequestProcessingPolicy.pidl index acb38c7b3e7..a7d47f4747c 100644 --- a/TAO/tao/PortableServer/RequestProcessingPolicy.pidl +++ b/TAO/tao/PortableServer/RequestProcessingPolicy.pidl @@ -32,10 +32,15 @@ module PortableServer USE_SERVANT_MANAGER }; +#if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) && !defined (TAO_HAS_MINIMUM_POA) + local interface RequestProcessingPolicy : CORBA::Policy { readonly attribute RequestProcessingPolicyValue value; }; + +#endif + }; #endif // _PORTABLESERVER_REQUESTPROCESSINGPOLICY_IDL_ diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp index 3b86eb66ce7..63e873629e9 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp @@ -13,7 +13,7 @@ ACE_RCSID (PortableServer, Request_Processing, "$Id$") -#if (TAO_HAS_MINIMUM_POA == 0) +#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h index 26fe17df989..6752b0dfe36 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h @@ -25,7 +25,7 @@ #include "tao/PortableServer/Servant_Location.h" #include "tao/PortableServer/PortableServer.h" -#if (TAO_HAS_MINIMUM_POA == 0) +#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp index c1f739832f5..9ad0493cb75 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp @@ -10,7 +10,7 @@ ACE_RCSID (PortableServer, RequestProcessingStrategyDefaultServantFI, "$Id$") -#if (TAO_HAS_MINIMUM_POA == 0) +#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h index 7328d0bd30a..220c4ffdfc1 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h @@ -23,7 +23,7 @@ #include "ace/Service_Config.h" #include "tao/PortableServer/RequestProcessingStrategyFactory.h" -#if (TAO_HAS_MINIMUM_POA == 0) +#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp index 666eb25551b..2010b5e9076 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp @@ -12,7 +12,7 @@ ACE_RCSID (PortableServer, Request_Processing, "$Id$") -#if (TAO_HAS_MINIMUM_POA == 0) +#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h index 66c6fb00397..19e1337576b 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if (TAO_HAS_MINIMUM_POA == 0) +#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) #include "tao/PortableServer/Servant_Location.h" #include "tao/PortableServer/PortableServer.h" diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp index a2b3d222282..69ae2437301 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp @@ -10,7 +10,7 @@ ACE_RCSID (PortableServer, RequestProcessingStrategyServantActivatorFactoryImpl, "$Id$") -#if (TAO_HAS_MINIMUM_POA == 0) +#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h index ea487fa69d3..b9aae2ca3d6 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h @@ -23,7 +23,7 @@ #include "ace/Service_Config.h" #include "tao/PortableServer/RequestProcessingStrategyFactory.h" -#if (TAO_HAS_MINIMUM_POA == 0) +#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp index e8ba2678612..481521ad6fb 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp @@ -11,7 +11,7 @@ ACE_RCSID (PortableServer, Request_Processing, "$Id$") -#if (TAO_HAS_MINIMUM_POA == 0) +#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h index 0c0bbbd72a5..79cac166c68 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if (TAO_HAS_MINIMUM_POA == 0) +#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) #include "tao/PortableServer/Servant_Location.h" #include "tao/PortableServer/PortableServer.h" diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp index 631d95d573d..fe3d489977d 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp @@ -10,7 +10,7 @@ ACE_RCSID (PortableServer, RequestProcessingStrategyServantLocatorFactoryImpl, "$Id$") -#if (TAO_HAS_MINIMUM_POA == 0) +#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h index 89e5d4db19b..adce55b71f2 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h @@ -23,7 +23,7 @@ #include "ace/Service_Config.h" #include "tao/PortableServer/RequestProcessingStrategyFactory.h" -#if (TAO_HAS_MINIMUM_POA == 0) +#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp index 9cfd35ba5ac..60cd7eb033f 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp @@ -9,7 +9,7 @@ ACE_RCSID (PortableServer, Request_Processing, "$Id$") -#if (TAO_HAS_MINIMUM_POA == 0) +#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h index 77932c74be9..ee152e2585e 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h @@ -23,7 +23,7 @@ #include "tao/PortableServer/Servant_Location.h" #include "tao/PortableServer/PortableServer.h" -#if (TAO_HAS_MINIMUM_POA == 0) +#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Root_POA.cpp b/TAO/tao/PortableServer/Root_POA.cpp index 93cce474824..6a88211aab5 100644 --- a/TAO/tao/PortableServer/Root_POA.cpp +++ b/TAO/tao/PortableServer/Root_POA.cpp @@ -77,7 +77,7 @@ TAO_Root_POA::objectkey_prefix [TAO_Root_POA::TAO_OBJECTKEY_PREFIX_SIZE] = { 000 }; -#if (TAO_HAS_MINIMUM_POA == 0) +#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) PortableServer::ThreadPolicy_ptr TAO_Root_POA::create_thread_policy (PortableServer::ThreadPolicyValue value @@ -93,7 +93,9 @@ TAO_Root_POA::create_thread_policy (PortableServer::ThreadPolicyValue value return policy; } -#endif /* TAO_HAS_MINIMUM_POA == 0 */ +#endif /* TAO_HAS_MINIMUM_POA == 0 && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */ + +#if !defined (CORBA_E_MICRO) PortableServer::LifespanPolicy_ptr TAO_Root_POA::create_lifespan_policy (PortableServer::LifespanPolicyValue value @@ -109,6 +111,9 @@ TAO_Root_POA::create_lifespan_policy (PortableServer::LifespanPolicyValue value return policy; } +#endif + +#if !defined (CORBA_E_MICRO) PortableServer::IdUniquenessPolicy_ptr TAO_Root_POA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value ACE_ENV_ARG_DECL) @@ -122,7 +127,9 @@ TAO_Root_POA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyVal return policy; } +#endif +#if !defined (CORBA_E_MICRO) PortableServer::IdAssignmentPolicy_ptr TAO_Root_POA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value ACE_ENV_ARG_DECL) @@ -136,8 +143,9 @@ TAO_Root_POA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyVal return policy; } +#endif -#if (TAO_HAS_MINIMUM_POA == 0) +#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) PortableServer::ImplicitActivationPolicy_ptr TAO_Root_POA::create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value @@ -219,7 +227,7 @@ TAO_Root_POA::TAO_Root_POA (const TAO_Root_POA::String &name, ort_adapter_ (0), adapter_state_ (PortableInterceptor::HOLDING), -#if (TAO_HAS_MINIMUM_POA == 0) +#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) adapter_activator_ (), @@ -350,7 +358,7 @@ TAO_Root_POA::complete_destruction_i (ACE_ENV_SINGLE_ARG_DECL) // <non_servant_upcall>. // -#if (TAO_HAS_MINIMUM_POA == 0) +#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) // ATTENTION: Trick locking here, see class header for details TAO::Portable_Server::Non_Servant_Upcall non_servant_upcall (*this); @@ -365,6 +373,7 @@ TAO_Root_POA::complete_destruction_i (ACE_ENV_SINGLE_ARG_DECL) ::CORBA::release (this); } +#if ! defined (CORBA_E_MICRO) PortableServer::POA_ptr TAO_Root_POA::create_POA_i (const char *adapter_name, PortableServer::POAManager_ptr poa_manager, @@ -446,6 +455,7 @@ TAO_Root_POA::create_POA_i (const char *adapter_name, return poa._retn (); } +#endif TAO_Root_POA * TAO_Root_POA::new_POA (const String &name, @@ -476,6 +486,7 @@ TAO_Root_POA::new_POA (const String &name, return poa; } +#if ! defined (CORBA_E_MICRO) PortableServer::POA_ptr TAO_Root_POA::create_POA_i (const TAO_Root_POA::String &adapter_name, PortableServer::POAManager_ptr poa_manager, @@ -562,7 +573,9 @@ TAO_Root_POA::create_POA_i (const TAO_Root_POA::String &adapter_name, // implementation. return new_poa._retn (); } +#endif +#if ! defined (CORBA_E_MICRO) PortableServer::POA_ptr TAO_Root_POA::find_POA (const char *adapter_name, CORBA::Boolean activate_it @@ -580,7 +593,9 @@ TAO_Root_POA::find_POA (const char *adapter_name, return PortableServer::POA::_duplicate (poa); } +#endif +#if ! defined (CORBA_E_MICRO) TAO_Root_POA * TAO_Root_POA::find_POA_i (const ACE_CString &child_name, CORBA::Boolean activate_it @@ -666,6 +681,7 @@ TAO_Root_POA::find_POA_i (const ACE_CString &child_name, 0); } } +#endif TAO_POA_Manager & TAO_Root_POA::tao_poa_manager () @@ -673,6 +689,7 @@ TAO_Root_POA::tao_poa_manager () return poa_manager_; } +#if ! defined (CORBA_E_MICRO) PortableServer::POA_ptr TAO_Root_POA::create_POA (const char *adapter_name, PortableServer::POAManager_ptr poa_manager, @@ -690,6 +707,7 @@ TAO_Root_POA::create_POA (const char *adapter_name, policies ACE_ENV_ARG_PARAMETER); } +#endif PortableServer::ObjectId * TAO_Root_POA::servant_to_id (PortableServer::Servant servant @@ -1225,6 +1243,7 @@ TAO_Root_POA::activate_object (PortableServer::Servant servant } } +#if !defined (CORBA_E_MICRO) void TAO_Root_POA::activate_object_with_id (const PortableServer::ObjectId &id, PortableServer::Servant servant @@ -1257,7 +1276,9 @@ TAO_Root_POA::activate_object_with_id (const PortableServer::ObjectId &id, return; } } +#endif +#if !defined (CORBA_E_MICRO) void TAO_Root_POA::activate_object_with_id_i (const PortableServer::ObjectId &id, PortableServer::Servant servant, @@ -1277,6 +1298,7 @@ TAO_Root_POA::activate_object_with_id_i (const PortableServer::ObjectId &id, ACE_ENV_ARG_PARAMETER); ACE_CHECK; } +#endif void TAO_Root_POA::deactivate_all_objects_i (CORBA::Boolean etherealize_objects, @@ -2567,7 +2589,7 @@ TAO_Root_POA::ORT_adapter_i (void) return this->ort_adapter_; } -#if (TAO_HAS_MINIMUM_POA == 0) +#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) PortableServer::AdapterActivator_ptr TAO_Root_POA::the_activator (ACE_ENV_SINGLE_ARG_DECL) @@ -2590,9 +2612,9 @@ TAO_Root_POA::the_activator (PortableServer::AdapterActivator_ptr adapter_activa this->adapter_activator_ = PortableServer::AdapterActivator::_duplicate (adapter_activator); } -#endif /* TAO_HAS_MINIMUM_POA == 0 */ +#endif /* TAO_HAS_MINIMUM_POA == 0 && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)*/ -#if (TAO_HAS_MINIMUM_POA == 0) +#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) PortableServer::ServantManager_ptr TAO_Root_POA::get_servant_manager (ACE_ENV_SINGLE_ARG_DECL) @@ -2683,7 +2705,7 @@ TAO_Root_POA::set_servant (PortableServer::Servant servant ACE_CHECK; } -#endif /* TAO_HAS_MINIMUM_POA == 0 */ +#endif /* TAO_HAS_MINIMUM_POA == 0 && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */ bool TAO_Root_POA::is_servant_activation_allowed (PortableServer::Servant servant, @@ -2888,13 +2910,14 @@ TAO_Root_POA::the_POAManager (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) return PortableServer::POAManager::_duplicate (&this->poa_manager_); } +#if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) PortableServer::POAManagerFactory_ptr TAO_Root_POA::the_POAManagerFactory (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::POAManagerFactory::_duplicate (&this->poa_manager_factory_); } - +#endif CORBA::ORB_ptr TAO_Root_POA::_get_orb (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) diff --git a/TAO/tao/PortableServer/Root_POA.h b/TAO/tao/PortableServer/Root_POA.h index eb6502c9ad1..c6f97421b05 100644 --- a/TAO/tao/PortableServer/Root_POA.h +++ b/TAO/tao/PortableServer/Root_POA.h @@ -121,6 +121,7 @@ public: typedef ACE_CString String; +#if !defined (CORBA_E_MICRO) PortableServer::POA_ptr create_POA ( const char *adapter_name, PortableServer::POAManager_ptr poa_manager, @@ -136,41 +137,46 @@ public: ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::AdapterNonExistent)); +#endif void destroy (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); -#if (TAO_HAS_MINIMUM_POA == 0) - +#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) PortableServer::ThreadPolicy_ptr create_thread_policy ( PortableServer::ThreadPolicyValue value ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC ((CORBA::SystemException)); - #endif /* TAO_HAS_MINIMUM_POA == 0 */ +#if !defined (CORBA_E_MICRO) PortableServer::LifespanPolicy_ptr create_lifespan_policy ( PortableServer::LifespanPolicyValue value ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC ((CORBA::SystemException)); +#endif +#if !defined (CORBA_E_MICRO) PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy ( PortableServer::IdUniquenessPolicyValue value ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC ((CORBA::SystemException)); +#endif +#if !defined (CORBA_E_MICRO) PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy ( PortableServer::IdAssignmentPolicyValue value ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC ((CORBA::SystemException)); +#endif -#if (TAO_HAS_MINIMUM_POA == 0) +#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy ( @@ -193,7 +199,7 @@ public: ) ACE_THROW_SPEC ((CORBA::SystemException)); -#endif /* TAO_HAS_MINIMUM_POA == 0 */ +#endif /* TAO_HAS_MINIMUM_POA == 0 && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */ char * the_name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -210,9 +216,11 @@ public: ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); +#if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) PortableServer::POAManagerFactory_ptr the_POAManagerFactory ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); +#endif /// This method returns the adapter_name as a sequence of strings of /// length one or more or just a fixed name depending on the Object @@ -232,8 +240,7 @@ public: IOP::ProfileId profile_id ACE_ENV_ARG_DECL); -#if (TAO_HAS_MINIMUM_POA == 0) - +#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) PortableServer::AdapterActivator_ptr the_activator ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -261,8 +268,7 @@ public: ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); - -#endif /* TAO_HAS_MINIMUM_POA == 0 */ +#endif /* TAO_HAS_MINIMUM_POA == 0 !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */ PortableServer::ObjectId *activate_object (PortableServer::Servant p_servant ACE_ENV_ARG_DECL_WITH_DEFAULTS) @@ -270,6 +276,7 @@ public: PortableServer::POA::ServantAlreadyActive, PortableServer::POA::WrongPolicy)); +#if !defined (CORBA_E_MICRO) void activate_object_with_id (const PortableServer::ObjectId &id, PortableServer::Servant p_servant ACE_ENV_ARG_DECL_WITH_DEFAULTS) @@ -277,6 +284,7 @@ public: PortableServer::POA::ServantAlreadyActive, PortableServer::POA::ObjectAlreadyActive, PortableServer::POA::WrongPolicy)); +#endif void deactivate_object (const PortableServer::ObjectId &oid ACE_ENV_ARG_DECL_WITH_DEFAULTS) @@ -613,6 +621,7 @@ protected: TAO_Object_Adapter *object_adapter ACE_ENV_ARG_DECL); +#if ! defined (CORBA_E_MICRO) PortableServer::POA_ptr create_POA_i ( const char *adapter_name, PortableServer::POAManager_ptr poa_manager, @@ -636,6 +645,7 @@ protected: ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::AdapterNonExistent)); +#endif void destroy_i (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion @@ -703,6 +713,7 @@ protected: PortableServer::POA::WrongPolicy)); protected: +#if !defined (CORBA_E_MICRO) void activate_object_with_id_i (const PortableServer::ObjectId &id, PortableServer::Servant p_servant, CORBA::Short priority, @@ -712,6 +723,7 @@ protected: PortableServer::POA::ServantAlreadyActive, PortableServer::POA::ObjectAlreadyActive, PortableServer::POA::WrongPolicy)); +#endif virtual void remove_from_parent_i (ACE_ENV_SINGLE_ARG_DECL); @@ -907,11 +919,9 @@ protected: TAO::Portable_Server::Active_Policy_Strategies active_policy_strategies_; -#if (TAO_HAS_MINIMUM_POA == 0) - +#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) PortableServer::AdapterActivator_var adapter_activator_; - -#endif /* TAO_HAS_MINIMUM_POA == 0 */ +#endif /* TAO_HAS_MINIMUM_POA == 0 !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */ typedef ACE_Hash_Map_Manager_Ex< diff --git a/TAO/tao/PortableServer/ServantActivator.pidl b/TAO/tao/PortableServer/ServantActivator.pidl index b517fa5ed42..daadaa4a612 100644 --- a/TAO/tao/PortableServer/ServantActivator.pidl +++ b/TAO/tao/PortableServer/ServantActivator.pidl @@ -27,6 +27,8 @@ #pragma prefix "omg.org" +#if ! defined (CORBA_E_COMPACT) && ! defined (CORBA_E_MICRO) && !defined (TAO_HAS_MINIMUM_POA) + module PortableServer { # pragma version PortableServer 2.3 @@ -47,4 +49,6 @@ module PortableServer }; }; +#endif + #endif // _PORTABLESERVER_SERVANT_ACTIVATOR_IDL_ diff --git a/TAO/tao/PortableServer/ServantLocator.pidl b/TAO/tao/PortableServer/ServantLocator.pidl index 39265e20d6f..19221cde6f8 100644 --- a/TAO/tao/PortableServer/ServantLocator.pidl +++ b/TAO/tao/PortableServer/ServantLocator.pidl @@ -32,6 +32,8 @@ #pragma prefix "omg.org" +#if ! defined (CORBA_E_COMPACT) && ! defined (CORBA_E_MICRO) && !defined (TAO_HAS_MINIMUM_POA) + module PortableServer { # pragma version PortableServer 2.3 @@ -54,7 +56,8 @@ module PortableServer in Cookie the_cookie, in Servant the_servant); }; - }; +#endif + #endif // _PORTABLESERVER_SERVANTLOCATOR_IDL_ diff --git a/TAO/tao/PortableServer/ServantManager.pidl b/TAO/tao/PortableServer/ServantManager.pidl index ad9d020b8ff..52c3707f543 100644 --- a/TAO/tao/PortableServer/ServantManager.pidl +++ b/TAO/tao/PortableServer/ServantManager.pidl @@ -22,6 +22,8 @@ #pragma prefix "omg.org" +#if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) && !defined (TAO_HAS_MINIMUM_POA) + module PortableServer { # pragma version PortableServer 2.3 @@ -30,4 +32,6 @@ module PortableServer local interface ServantManager {}; }; +#endif + #endif // _PORTABLESERVER_SERVANT_MANAGER_IDL_ diff --git a/TAO/tao/PortableServer/ServantRetentionPolicy.cpp b/TAO/tao/PortableServer/ServantRetentionPolicy.cpp index 4bbcdddeb11..b4301aef697 100644 --- a/TAO/tao/PortableServer/ServantRetentionPolicy.cpp +++ b/TAO/tao/PortableServer/ServantRetentionPolicy.cpp @@ -5,7 +5,7 @@ ACE_RCSID (PortableServer, ServantRetentionPolicy, "$Id$") -#if (TAO_HAS_MINIMUM_POA == 0) +#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/ServantRetentionPolicy.h b/TAO/tao/PortableServer/ServantRetentionPolicy.h index 067b3160089..948d7ee33dc 100644 --- a/TAO/tao/PortableServer/ServantRetentionPolicy.h +++ b/TAO/tao/PortableServer/ServantRetentionPolicy.h @@ -30,7 +30,7 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -#if (TAO_HAS_MINIMUM_POA == 0) +#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/ServantRetentionPolicy.pidl b/TAO/tao/PortableServer/ServantRetentionPolicy.pidl index 641e81f6ffd..79f6b54bd46 100644 --- a/TAO/tao/PortableServer/ServantRetentionPolicy.pidl +++ b/TAO/tao/PortableServer/ServantRetentionPolicy.pidl @@ -31,10 +31,15 @@ module PortableServer NON_RETAIN }; +#if !defined (TAO_HAS_MINIMUM_POA) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) + local interface ServantRetentionPolicy : CORBA::Policy { readonly attribute ServantRetentionPolicyValue value; }; + +#endif + }; #endif // _PORTABLESERVER_SERVANTRETENTIONPOLICY_IDL_ diff --git a/TAO/tao/PortableServer/ServantRetentionStrategy.h b/TAO/tao/PortableServer/ServantRetentionStrategy.h index 7dba84696c7..053fcb8961e 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategy.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategy.h @@ -69,6 +69,7 @@ namespace TAO PortableServer::POA::ServantAlreadyActive, PortableServer::POA::WrongPolicy)) = 0; +#if !defined (CORBA_E_MICRO) virtual void activate_object_with_id ( const PortableServer::ObjectId &id, PortableServer::Servant servant, @@ -79,6 +80,7 @@ namespace TAO PortableServer::POA::ServantAlreadyActive, PortableServer::POA::ObjectAlreadyActive, PortableServer::POA::WrongPolicy)) = 0; +#endif virtual void deactivate_object (const PortableServer::ObjectId &id ACE_ENV_ARG_DECL) = 0; diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp index 2084a6bebea..a0a365fd003 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp +++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp @@ -137,7 +137,7 @@ namespace TAO return 0; } - int + int ServantRetentionStrategyNonRetain::find_servant_priority ( const PortableServer::ObjectId &/*system_id*/, CORBA::Short &/*priority*/ @@ -206,6 +206,7 @@ namespace TAO 0); } +#if !defined (CORBA_E_MICRO) void ServantRetentionStrategyNonRetain::activate_object_with_id ( const PortableServer::ObjectId &/*id*/, @@ -220,6 +221,7 @@ namespace TAO { ACE_THROW (PortableServer::POA::WrongPolicy ()); } +#endif CORBA::Object_ptr ServantRetentionStrategyNonRetain::create_reference ( diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h index cb5fa9a53c7..1b26e36fe54 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h @@ -52,6 +52,7 @@ namespace TAO PortableServer::POA::ServantAlreadyActive, PortableServer::POA::WrongPolicy)); +#if !defined (CORBA_E_MICRO) virtual void activate_object_with_id (const PortableServer::ObjectId &id, @@ -63,6 +64,7 @@ namespace TAO PortableServer::POA::ServantAlreadyActive, PortableServer::POA::ObjectAlreadyActive, PortableServer::POA::WrongPolicy)); +#endif virtual void deactivate_object (const PortableServer::ObjectId &id ACE_ENV_ARG_DECL); diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp index ecccbc7eaf5..3543a783c74 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp +++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp @@ -358,7 +358,7 @@ namespace TAO return servant; } - int + int ServantRetentionStrategyRetain::find_servant_priority ( const PortableServer::ObjectId &system_id, CORBA::Short &priority @@ -845,6 +845,7 @@ namespace TAO return user_id._retn (); } +#if !defined (CORBA_E_MICRO) void ServantRetentionStrategyRetain::activate_object_with_id ( const PortableServer::ObjectId &id, @@ -956,6 +957,7 @@ namespace TAO servant->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } +#endif CORBA::Object_ptr ServantRetentionStrategyRetain::create_reference ( diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h index 011d4513fa6..a82ba0aa20a 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h @@ -53,6 +53,7 @@ namespace TAO PortableServer::POA::ServantAlreadyActive, PortableServer::POA::WrongPolicy)); +#if !defined (CORBA_E_MICRO) virtual void activate_object_with_id (const PortableServer::ObjectId &id, @@ -64,6 +65,7 @@ namespace TAO PortableServer::POA::ServantAlreadyActive, PortableServer::POA::ObjectAlreadyActive, PortableServer::POA::WrongPolicy)); +#endif void deactivate_object (const PortableServer::ObjectId &id ACE_ENV_ARG_DECL); diff --git a/TAO/tao/PortableServer/Servant_Upcall.cpp b/TAO/tao/PortableServer/Servant_Upcall.cpp index 5df9cff3d57..e68f9f42bcb 100644 --- a/TAO/tao/PortableServer/Servant_Upcall.cpp +++ b/TAO/tao/PortableServer/Servant_Upcall.cpp @@ -148,7 +148,7 @@ namespace TAO if (wait_occurred_restart_call) return TAO_Adapter::DS_FAILED; } -#if (TAO_HAS_MINIMUM_CORBA == 0) +#if (TAO_HAS_MINIMUM_CORBA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) ACE_CATCH (PortableServer::ForwardRequest, forward_request) { forward_to = diff --git a/TAO/tao/PortableServer/Special_Basic_SArgument_T.cpp b/TAO/tao/PortableServer/Special_Basic_SArgument_T.cpp index f15942d5e54..2cdb15d8b5b 100644 --- a/TAO/tao/PortableServer/Special_Basic_SArgument_T.cpp +++ b/TAO/tao/PortableServer/Special_Basic_SArgument_T.cpp @@ -17,7 +17,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S, typename to_S, typename from_S, - typename Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::In_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::demarshal ( TAO_InputCDR & cdr @@ -31,12 +31,12 @@ TAO::In_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::demarshal ( template<typename S, typename to_S, typename from_S, - typename Insert_Policy> + template <typename> class Insert_Policy> void TAO::In_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>:: interceptor_value (CORBA::Any *any) const { - this->Insert_Policy::any_insert (any, from_S (this->x_)); + Insert_Policy<from_S>::any_insert (any, from_S (this->x_)); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -46,7 +46,7 @@ interceptor_value (CORBA::Any *any) const template<typename S, typename to_S, typename from_S, - typename Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Inout_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::marshal ( TAO_OutputCDR & cdr @@ -58,7 +58,7 @@ TAO::Inout_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::marshal ( template<typename S, typename to_S, typename from_S, - typename Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Inout_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::demarshal ( TAO_InputCDR & cdr @@ -72,12 +72,12 @@ TAO::Inout_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::demarshal ( template<typename S, typename to_S, typename from_S, - typename Insert_Policy> + template <typename> class Insert_Policy> void TAO::Inout_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>:: interceptor_value (CORBA::Any *any) const { - this->Insert_Policy::any_insert (any, from_S (this->x_)); + Insert_Policy<from_S>::any_insert (any, from_S (this->x_)); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -87,7 +87,7 @@ interceptor_value (CORBA::Any *any) const template<typename S, typename to_S, typename from_S, - typename Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Out_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::marshal ( TAO_OutputCDR & cdr @@ -101,12 +101,12 @@ TAO::Out_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::marshal ( template<typename S, typename to_S, typename from_S, - typename Insert_Policy> + template <typename> class Insert_Policy> void TAO::Out_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>:: interceptor_value (CORBA::Any *any) const { - this->Insert_Policy::any_insert (any, from_S (this->x_)); + Insert_Policy<from_S>::any_insert (any, from_S (this->x_)); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -116,7 +116,7 @@ interceptor_value (CORBA::Any *any) const template<typename S, typename to_S, typename from_S, - typename Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Ret_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::marshal ( TAO_OutputCDR & cdr @@ -130,12 +130,12 @@ TAO::Ret_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::marshal ( template<typename S, typename to_S, typename from_S, - typename Insert_Policy> + template <typename> class Insert_Policy> void TAO::Ret_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>:: interceptor_value (CORBA::Any *any) const { - this->Insert_Policy::any_insert (any, from_S (this->x_)); + Insert_Policy<from_S>::any_insert (any, from_S (this->x_)); } #endif /* TAO_HAS_INTERCEPTORS */ diff --git a/TAO/tao/PortableServer/Special_Basic_SArgument_T.h b/TAO/tao/PortableServer/Special_Basic_SArgument_T.h index bb240a0a03f..1ebcb1798cb 100644 --- a/TAO/tao/PortableServer/Special_Basic_SArgument_T.h +++ b/TAO/tao/PortableServer/Special_Basic_SArgument_T.h @@ -36,8 +36,8 @@ namespace TAO template<typename S, typename to_S, typename from_S, - typename Insert_Policy> - class In_Special_Basic_SArgument_T : public InArgument, private Insert_Policy + template <typename> class Insert_Policy> + class In_Special_Basic_SArgument_T : public InArgument { public: In_Special_Basic_SArgument_T (void); @@ -61,8 +61,8 @@ namespace TAO template<typename S, typename to_S, typename from_S, - typename Insert_Policy> - class Inout_Special_Basic_SArgument_T : public InoutArgument, private Insert_Policy + template <typename> class Insert_Policy> + class Inout_Special_Basic_SArgument_T : public InoutArgument { public: Inout_Special_Basic_SArgument_T (void); @@ -87,8 +87,8 @@ namespace TAO template<typename S, typename to_S, typename from_S, - typename Insert_Policy> - class Out_Special_Basic_SArgument_T : public OutArgument, private Insert_Policy + template <typename> class Insert_Policy> + class Out_Special_Basic_SArgument_T : public OutArgument { public: Out_Special_Basic_SArgument_T (void); @@ -112,8 +112,8 @@ namespace TAO template<typename S, typename to_S, typename from_S, - typename Insert_Policy> - class Ret_Special_Basic_SArgument_T : public RetArgument, private Insert_Policy + template <typename> class Insert_Policy> + class Ret_Special_Basic_SArgument_T : public RetArgument { public: Ret_Special_Basic_SArgument_T (void); @@ -135,7 +135,7 @@ namespace TAO * of (w)char/boolean/octet. * */ - template<typename T, typename to_T, typename from_T, typename Insert_Policy> + template<typename T, typename to_T, typename from_T, template <typename> class Insert_Policy> struct Special_Basic_SArg_Traits_T { typedef T ret_type; diff --git a/TAO/tao/PortableServer/Special_Basic_SArgument_T.inl b/TAO/tao/PortableServer/Special_Basic_SArgument_T.inl index 6c3d9685b54..90b5f23677e 100644 --- a/TAO/tao/PortableServer/Special_Basic_SArgument_T.inl +++ b/TAO/tao/PortableServer/Special_Basic_SArgument_T.inl @@ -7,7 +7,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S, typename to_S, typename from_S, - typename Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::In_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>:: In_Special_Basic_SArgument_T (void) @@ -17,7 +17,7 @@ In_Special_Basic_SArgument_T (void) template<typename S, typename to_S, typename from_S, - typename Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE S const & TAO::In_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::arg (void) const @@ -30,7 +30,7 @@ TAO::In_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::arg (void) const template<typename S, typename to_S, typename from_S, - typename Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::Inout_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>:: Inout_Special_Basic_SArgument_T (void) @@ -40,7 +40,7 @@ Inout_Special_Basic_SArgument_T (void) template<typename S, typename to_S, typename from_S, - typename Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE S & TAO::Inout_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::arg (void) @@ -53,7 +53,7 @@ TAO::Inout_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::arg (void) template<typename S, typename to_S, typename from_S, - typename Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::Out_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>:: Out_Special_Basic_SArgument_T (void) @@ -63,7 +63,7 @@ Out_Special_Basic_SArgument_T (void) template<typename S, typename to_S, typename from_S, - typename Insert_Policy> + template <typename> class Insert_Policy> S & TAO::Out_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::arg (void) { @@ -75,7 +75,7 @@ TAO::Out_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::arg (void) template<typename S, typename to_S, typename from_S, - typename Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::Ret_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>:: Ret_Special_Basic_SArgument_T (void) @@ -85,7 +85,7 @@ Ret_Special_Basic_SArgument_T (void) template<typename S, typename to_S, typename from_S, - typename Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE S & TAO::Ret_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::arg (void) diff --git a/TAO/tao/PortableServer/Special_Basic_SArguments.h b/TAO/tao/PortableServer/Special_Basic_SArguments.h index f306336fe83..eae031847fb 100644 --- a/TAO/tao/PortableServer/Special_Basic_SArguments.h +++ b/TAO/tao/PortableServer/Special_Basic_SArguments.h @@ -43,7 +43,7 @@ namespace TAO : public Special_Basic_SArg_Traits_T<CORBA::Char, ACE_InputCDR::to_char, ACE_OutputCDR::from_char, - TAO::Any_Insert_Policy_Stream <ACE_OutputCDR::from_char> > + TAO::Any_Insert_Policy_Stream> { }; @@ -52,7 +52,7 @@ namespace TAO : public Special_Basic_SArg_Traits_T<CORBA::WChar, ACE_InputCDR::to_wchar, ACE_OutputCDR::from_wchar, - TAO::Any_Insert_Policy_Stream <ACE_OutputCDR::from_wchar> > + TAO::Any_Insert_Policy_Stream> { }; @@ -61,7 +61,7 @@ namespace TAO : public Special_Basic_SArg_Traits_T<CORBA::Octet, ACE_InputCDR::to_octet, ACE_OutputCDR::from_octet, - TAO::Any_Insert_Policy_Stream <ACE_OutputCDR::from_octet> > + TAO::Any_Insert_Policy_Stream> { }; @@ -70,7 +70,7 @@ namespace TAO : public Special_Basic_SArg_Traits_T<CORBA::Boolean, ACE_InputCDR::to_boolean, ACE_OutputCDR::from_boolean, - TAO::Any_Insert_Policy_Stream <ACE_OutputCDR::from_boolean> > + TAO::Any_Insert_Policy_Stream> { }; diff --git a/TAO/tao/PortableServer/ThreadPolicy.cpp b/TAO/tao/PortableServer/ThreadPolicy.cpp index 2268a11ae61..747e4b42ef3 100644 --- a/TAO/tao/PortableServer/ThreadPolicy.cpp +++ b/TAO/tao/PortableServer/ThreadPolicy.cpp @@ -5,7 +5,7 @@ ACE_RCSID (PortableServer, ThreadPolicy, "$Id$") -#if (TAO_HAS_MINIMUM_POA == 0) +#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/ThreadPolicy.h b/TAO/tao/PortableServer/ThreadPolicy.h index a85fc863cb1..5159fc646be 100644 --- a/TAO/tao/PortableServer/ThreadPolicy.h +++ b/TAO/tao/PortableServer/ThreadPolicy.h @@ -30,7 +30,7 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -#if (TAO_HAS_MINIMUM_POA == 0) +#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/ThreadPolicy.pidl b/TAO/tao/PortableServer/ThreadPolicy.pidl index 67f4c9ee964..253a7b8dcbb 100644 --- a/TAO/tao/PortableServer/ThreadPolicy.pidl +++ b/TAO/tao/PortableServer/ThreadPolicy.pidl @@ -32,10 +32,13 @@ module PortableServer /* ,MAIN_THREAD_MODEL*/ }; +#if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) && !defined (TAO_HAS_MINIMUM_POA) local interface ThreadPolicy : CORBA::Policy { readonly attribute ThreadPolicyValue value; }; +#endif + }; #endif // _PORTABLESERVER_THREAD_POLICY_IDL_ diff --git a/TAO/tao/PortableServer/TypeCode_SArg_Traits.h b/TAO/tao/PortableServer/TypeCode_SArg_Traits.h index 57f4513a175..77eff8e57ad 100644 --- a/TAO/tao/PortableServer/TypeCode_SArg_Traits.h +++ b/TAO/tao/PortableServer/TypeCode_SArg_Traits.h @@ -48,9 +48,7 @@ namespace TAO : public Object_SArg_Traits_T<CORBA::TypeCode_ptr, CORBA::TypeCode_var, CORBA::TypeCode_out, - TAO::Any_Insert_Policy_Stream < - CORBA::TypeCode_ptr - > + TAO::Any_Insert_Policy_Stream > { }; diff --git a/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp b/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp index 8be7c23ac34..fa597cd3884 100644 --- a/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp +++ b/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp @@ -12,7 +12,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S_forany, - typename Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::In_Var_Array_SArgument_T<S_forany, Insert_Policy>::demarshal (TAO_InputCDR & cdr) @@ -24,21 +24,28 @@ TAO::In_Var_Array_SArgument_T<S_forany, #if TAO_HAS_INTERCEPTORS == 1 template<typename S_forany, - typename Insert_Policy> + template <typename> class Insert_Policy> void TAO::In_Var_Array_SArgument_T<S_forany, Insert_Policy>::interceptor_value ( CORBA::Any *any) const { - this->Insert_Policy::any_insert (any, S_forany (this->x_)); + Insert_Policy<S_forany>::any_insert (any, S_forany (this->x_)); } #endif /* TAO_HAS_INTERCEPTORS */ // =========================================================== +<<<<<<< Var_Array_SArgument_T.cpp +template<typename S, + typename S_slice, + typename S_forany, + template <typename> class Insert_Policy> +======= template<typename S_forany, typename Insert_Policy> +>>>>>>> 1.9 CORBA::Boolean TAO::Inout_Var_Array_SArgument_T<S_forany, Insert_Policy>::marshal (TAO_OutputCDR &cdr) @@ -46,8 +53,15 @@ TAO::Inout_Var_Array_SArgument_T<S_forany, return cdr << S_forany (this->x_); } +<<<<<<< Var_Array_SArgument_T.cpp +template<typename S, + typename S_slice, + typename S_forany, + template <typename> class Insert_Policy> +======= template<typename S_forany, typename Insert_Policy> +>>>>>>> 1.9 CORBA::Boolean TAO::Inout_Var_Array_SArgument_T<S_forany, Insert_Policy>::demarshal (TAO_InputCDR & cdr) @@ -58,17 +72,28 @@ TAO::Inout_Var_Array_SArgument_T<S_forany, #if TAO_HAS_INTERCEPTORS == 1 +<<<<<<< Var_Array_SArgument_T.cpp +template<typename S, + typename S_slice, + typename S_forany, + template <typename> class Insert_Policy> +======= template<typename S_forany, typename Insert_Policy> +>>>>>>> 1.9 void TAO::Inout_Var_Array_SArgument_T<S_forany, Insert_Policy>::interceptor_value ( CORBA::Any *any) const { +<<<<<<< Var_Array_SArgument_T.cpp + Insert_Policy<S_forany>::any_insert (any, S_forany (const_cast <S_slice *>(this->x_))); +======= this->Insert_Policy::any_insert ( any, S_forany (const_cast <typename S_forany::_slice_type *>(this->x_)) ); +>>>>>>> 1.9 } #endif /* TAO_HAS_INTERCEPTORS */ @@ -77,7 +102,7 @@ TAO::Inout_Var_Array_SArgument_T<S_forany, template<typename S_var, typename S_forany, - typename Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Out_Var_Array_SArgument_T<S_var, S_forany, @@ -93,14 +118,14 @@ TAO::Out_Var_Array_SArgument_T<S_var, template<typename S_var, typename S_forany, - typename Insert_Policy> + template <typename> class Insert_Policy> void TAO::Out_Var_Array_SArgument_T<S_var, S_forany, Insert_Policy>::interceptor_value ( CORBA::Any *any) const { - this->Insert_Policy::any_insert (any, S_forany (this->x_.ptr ())); + Insert_Policy<S_forany>::any_insert (any, S_forany (this->x_.ptr ())); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -109,7 +134,7 @@ TAO::Out_Var_Array_SArgument_T<S_var, template<typename S_var, typename S_forany, - typename Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Ret_Var_Array_SArgument_T<S_var, S_forany, @@ -124,14 +149,14 @@ TAO::Ret_Var_Array_SArgument_T<S_var, template<typename S_var, typename S_forany, - typename Insert_Policy> + template <typename> class Insert_Policy> void TAO::Ret_Var_Array_SArgument_T<S_var, S_forany, Insert_Policy>::interceptor_value ( CORBA::Any *any) const { - this->Insert_Policy::any_insert (any, S_forany (this->x_.ptr ())); + Insert_Policy<S_forany>::any_insert (any, S_forany (this->x_.ptr ())); } #endif /* TAO_HAS_INTERCEPTORS */ diff --git a/TAO/tao/PortableServer/Var_Array_SArgument_T.h b/TAO/tao/PortableServer/Var_Array_SArgument_T.h index 78f08112a35..6057e45988f 100644 --- a/TAO/tao/PortableServer/Var_Array_SArgument_T.h +++ b/TAO/tao/PortableServer/Var_Array_SArgument_T.h @@ -32,8 +32,8 @@ namespace TAO * */ template<typename S_forany, - typename Insert_Policy> - class In_Var_Array_SArgument_T : public InArgument, private Insert_Policy + template <typename> class Insert_Policy> + class In_Var_Array_SArgument_T : public InArgument { public: @@ -56,8 +56,8 @@ namespace TAO * */ template<typename S_forany, - typename Insert_Policy> - class Inout_Var_Array_SArgument_T : public InoutArgument, private Insert_Policy + template <typename> class Insert_Policy> + class Inout_Var_Array_SArgument_T : public InoutArgument { public: Inout_Var_Array_SArgument_T (void); @@ -81,8 +81,8 @@ namespace TAO */ template<typename S_var, typename S_forany, - typename Insert_Policy> - class Out_Var_Array_SArgument_T : public OutArgument, private Insert_Policy + template <typename> class Insert_Policy> + class Out_Var_Array_SArgument_T : public OutArgument { public: Out_Var_Array_SArgument_T (void); @@ -105,8 +105,8 @@ namespace TAO */ template<typename S_var, typename S_forany, - typename Insert_Policy> - class Ret_Var_Array_SArgument_T : public RetArgument, private Insert_Policy + template <typename> class Insert_Policy> + class Ret_Var_Array_SArgument_T : public RetArgument { public: Ret_Var_Array_SArgument_T (void); @@ -129,7 +129,7 @@ namespace TAO */ template<typename T_out, typename T_forany, - typename Insert_Policy> + template <typename> class Insert_Policy> struct Var_Array_SArg_Traits_T { typedef typename T_forany::_slice_type * ret_type; diff --git a/TAO/tao/PortableServer/Var_Array_SArgument_T.inl b/TAO/tao/PortableServer/Var_Array_SArgument_T.inl index adfe8f78dfc..68d6b6ad0d2 100644 --- a/TAO/tao/PortableServer/Var_Array_SArgument_T.inl +++ b/TAO/tao/PortableServer/Var_Array_SArgument_T.inl @@ -5,14 +5,14 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S_forany, - typename Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::In_Var_Array_SArgument_T<S_forany, Insert_Policy>::In_Var_Array_SArgument_T (void) {} template<typename S_forany, - typename Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE typename S_forany::_slice_type const * TAO::In_Var_Array_SArgument_T<S_forany, @@ -25,7 +25,7 @@ TAO::In_Var_Array_SArgument_T<S_forany, // ========================================================================== template<typename S_forany, - typename Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::Inout_Var_Array_SArgument_T<S_forany, Insert_Policy>:: @@ -34,9 +34,11 @@ Inout_Var_Array_SArgument_T (void) } template<typename S_forany, - typename Insert_Policy> + template <typename> class Insert_Policy> typename S_forany::_slice_type * -TAO::Inout_Var_Array_SArgument_T<S_forany, +TAO::Inout_Var_Array_SArgument_T<S, + S_slice, + S_forany, Insert_Policy>::arg (void) { S_forany tmp (this->x_); @@ -47,7 +49,7 @@ TAO::Inout_Var_Array_SArgument_T<S_forany, template<typename S_var, typename S_forany, - typename Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::Out_Var_Array_SArgument_T<S_var, S_forany, @@ -58,7 +60,7 @@ Out_Var_Array_SArgument_T (void) template<typename S_var, typename S_forany, - typename Insert_Policy> + template <typename> class Insert_Policy> typename S_forany::_slice_type *& TAO::Out_Var_Array_SArgument_T<S_var, S_forany, @@ -71,7 +73,7 @@ TAO::Out_Var_Array_SArgument_T<S_var, template<typename S_var, typename S_forany, - typename Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE TAO::Ret_Var_Array_SArgument_T<S_var, S_forany, @@ -82,7 +84,7 @@ Ret_Var_Array_SArgument_T (void) template<typename S_var, typename S_forany, - typename Insert_Policy> + template <typename> class Insert_Policy> ACE_INLINE typename S_forany::_slice_type *& TAO::Ret_Var_Array_SArgument_T<S_var, diff --git a/TAO/tao/PortableServer/diffs/AdapterActivator.diff b/TAO/tao/PortableServer/diffs/AdapterActivator.diff deleted file mode 100644 index cb97401f33c..00000000000 --- a/TAO/tao/PortableServer/diffs/AdapterActivator.diff +++ /dev/null @@ -1,57 +0,0 @@ ---- orig/AdapterActivatorC.h 2005-04-11 16:43:59.830620800 +0200 -+++ AdapterActivatorC.h 2005-04-11 16:44:03.676150400 +0200 -@@ -66,9 +66,10 @@ - // TAO_IDL - Generated from - // be\be_visitor_module/module_ch.cpp:48 - -+#if (TAO_HAS_MINIMUM_POA == 0) -+ - namespace PortableServer - { -- - // TAO_IDL - Generated from - // be\be_interface.cpp:598 - -@@ -211,6 +212,8 @@ - TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::AdapterActivator_ptr *); // non-copying - TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::AdapterActivator_ptr &); - -+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ -+ - // TAO_IDL - Generated from - // be\be_codegen.cpp:955 - ---- orig/AdapterActivatorC.cpp 2005-04-11 16:43:59.830620800 +0200 -+++ AdapterActivatorC.cpp 2005-04-11 16:44:31.986859200 +0200 -@@ -40,6 +40,8 @@ - // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:69 - -+#if (TAO_HAS_MINIMUM_POA == 0) -+ - // Arg traits specializations. - namespace TAO - { -@@ -186,3 +188,5 @@ - { - return false; - } -+ -+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ ---- orig/AdapterActivatorA.cpp 2005-04-11 16:43:59.830620800 +0200 -+++ AdapterActivatorA.cpp 2005-04-11 16:44:25.647744000 +0200 -@@ -35,6 +35,8 @@ - #include "tao/Any.h" - #include "tao/Any_Impl_T.h" - -+#if (TAO_HAS_MINIMUM_POA == 0) -+ - // TAO_IDL - Generated from - // be\be_visitor_typecode/objref_typecode.cpp:76 - -@@ -121,3 +123,5 @@ - _tao_elem - ); - } -+ -+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/diffs/ForwardRequest.diff b/TAO/tao/PortableServer/diffs/ForwardRequest.diff deleted file mode 100644 index cd868c7cea6..00000000000 --- a/TAO/tao/PortableServer/diffs/ForwardRequest.diff +++ /dev/null @@ -1,54 +0,0 @@ ---- orig/ForwardRequestC.h 2005-04-11 16:44:02.454393600 +0200 -+++ ForwardRequestC.h 2005-04-11 16:44:04.937964800 +0200 -@@ -59,6 +59,8 @@ - #pragma option push -w-rvl -w-rch -w-ccc -w-inl - #endif /* __BORLANDC__ */ - -+#if (TAO_HAS_MINIMUM_POA == 0) -+ - // TAO_IDL - Generated from - // be\be_visitor_module/module_ch.cpp:48 - -@@ -153,6 +155,8 @@ - // TAO_IDL - Generated from - // be\be_codegen.cpp:955 - -+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ -+ - #if defined(_MSC_VER) - #pragma warning(pop) - #endif /* _MSC_VER */ ---- orig/ForwardRequestC.cpp 2005-04-11 16:44:02.454393600 +0200 -+++ ForwardRequestC.cpp 2005-04-11 16:44:51.324665600 +0200 -@@ -38,6 +38,8 @@ - #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig - #endif /* __BORLANDC__ */ - -+#if (TAO_HAS_MINIMUM_POA == 0) -+ - // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:69 - -@@ -202,3 +204,5 @@ - (strm >> _tao_aggregate.forward_reference.out ()) - ); - } -+ -+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ ---- orig/ForwardRequestA.cpp 2005-04-11 16:44:02.454393600 +0200 -+++ ForwardRequestA.cpp 2005-04-11 16:44:44.885406400 +0200 -@@ -62,6 +62,8 @@ - - - -+#if (TAO_HAS_MINIMUM_POA == 0) -+ - // TAO_IDL - Generated from - // be\be_visitor_exception/any_op_cs.cpp:50 - -@@ -146,3 +148,5 @@ - _tao_elem - ); - } -+ -+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/diffs/ImplicitActivationPolicy.diff b/TAO/tao/PortableServer/diffs/ImplicitActivationPolicy.diff deleted file mode 100644 index 595c5d167aa..00000000000 --- a/TAO/tao/PortableServer/diffs/ImplicitActivationPolicy.diff +++ /dev/null @@ -1,86 +0,0 @@ ---- orig/ImplicitActivationPolicyC.h 2005-04-11 16:44:00.311312000 +0200 -+++ ImplicitActivationPolicyC.h 2005-04-11 16:46:31.779112000 +0200 -@@ -78,6 +78,7 @@ - NO_IMPLICIT_ACTIVATION - }; - -+#if (TAO_HAS_MINIMUM_POA == 0) - typedef ImplicitActivationPolicyValue &ImplicitActivationPolicyValue_out; - - // TAO_IDL - Generated from -@@ -207,6 +208,8 @@ - // TAO_IDL - Generated from - // be\be_visitor_module/module_ch.cpp:66 - -+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ -+ - } // module PortableServer - - // TAO_IDL - Generated from -@@ -215,6 +218,7 @@ - // Traits specializations. - namespace TAO - { -+#if (TAO_HAS_MINIMUM_POA == 0) - - #if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY__TRAITS_CH_) - #define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY__TRAITS_CH_ -@@ -236,11 +240,15 @@ - }; - - #endif /* end #if !defined */ -+ -+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ - } - - // TAO_IDL - Generated from - // be\be_visitor_enum/any_op_ch.cpp:51 - -+#if (TAO_HAS_MINIMUM_POA == 0) -+ - TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ImplicitActivationPolicyValue); - TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ImplicitActivationPolicyValue &); - -@@ -257,6 +265,8 @@ - TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, PortableServer::ImplicitActivationPolicyValue); - TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ImplicitActivationPolicyValue &); - -+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ -+ - // TAO_IDL - Generated from - // be\be_codegen.cpp:955 - ---- orig/ImplicitActivationPolicyC.cpp 2005-04-11 16:44:00.311312000 +0200 -+++ ImplicitActivationPolicyC.cpp 2005-04-11 16:45:07.347705600 +0200 -@@ -40,6 +40,8 @@ - // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:69 - -+#if (TAO_HAS_MINIMUM_POA == 0) -+ - // Arg traits specializations. - namespace TAO - { -@@ -211,3 +213,5 @@ - - return _tao_success; - } -+ -+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ ---- orig/ImplicitActivationPolicyA.cpp 2005-04-11 16:44:00.311312000 +0200 -+++ ImplicitActivationPolicyA.cpp 2005-04-11 16:45:02.230347200 +0200 -@@ -36,6 +36,8 @@ - #include "tao/Any_Impl_T.h" - #include "tao/Any_Basic_Impl_T.h" - -+#if (TAO_HAS_MINIMUM_POA == 0) -+ - // TAO_IDL - Generated from - // be\be_visitor_typecode/enum_typecode.cpp:34 - -@@ -177,3 +179,5 @@ - _tao_elem - ); - } -+ -+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/diffs/POAManager.diff b/TAO/tao/PortableServer/diffs/POAManager.diff deleted file mode 100644 index 8802c550a4c..00000000000 --- a/TAO/tao/PortableServer/diffs/POAManager.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- orig/POAManagerC.h 2005-04-11 16:44:00.771974400 +0200 -+++ POAManagerC.h 2005-04-11 16:44:04.216928000 +0200 -@@ -207,6 +207,8 @@ - // TAO_IDL - Generated from - // be\be_visitor_operation/operation_ch.cpp:46 - -+#if (TAO_HAS_MINIMUM_POA == 0) -+ - virtual void hold_requests ( - ::CORBA::Boolean wait_for_completion - ACE_ENV_ARG_DECL_WITH_DEFAULTS -@@ -241,6 +243,8 @@ - ::PortableServer::POAManager::AdapterInactive - )) = 0; - -+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ -+ - // TAO_IDL - Generated from - // be\be_visitor_operation/operation_ch.cpp:46 - diff --git a/TAO/tao/PortableServer/diffs/RequestProcessingPolicy.diff b/TAO/tao/PortableServer/diffs/RequestProcessingPolicy.diff deleted file mode 100644 index 63779dbbcda..00000000000 --- a/TAO/tao/PortableServer/diffs/RequestProcessingPolicy.diff +++ /dev/null @@ -1,87 +0,0 @@ ---- orig/RequestProcessingPolicyC.h 2005-04-11 16:44:01.633212800 +0200 -+++ RequestProcessingPolicyC.h 2005-04-11 16:49:35.953942400 +0200 -@@ -79,6 +79,7 @@ - USE_SERVANT_MANAGER - }; - -+#if (TAO_HAS_MINIMUM_POA == 0) - typedef RequestProcessingPolicyValue &RequestProcessingPolicyValue_out; - - // TAO_IDL - Generated from -@@ -205,6 +206,7 @@ - - extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_RequestProcessingPolicy; - -+#endif /* TAO_HAS_MINIMUM_POA == 0 */ - // TAO_IDL - Generated from - // be\be_visitor_module/module_ch.cpp:66 - -@@ -217,6 +219,8 @@ - namespace TAO - { - -+#if (TAO_HAS_MINIMUM_POA == 0) -+ - #if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY__TRAITS_CH_) - #define _PORTABLESERVER_REQUESTPROCESSINGPOLICY__TRAITS_CH_ - -@@ -237,11 +241,16 @@ - }; - - #endif /* end #if !defined */ -+ -+#endif /* TAO_HAS_MINIMUM_POA == 0 */ -+ - } - - // TAO_IDL - Generated from - // be\be_visitor_enum/any_op_ch.cpp:51 - -+#if (TAO_HAS_MINIMUM_POA == 0) -+ - TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::RequestProcessingPolicyValue); - TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::RequestProcessingPolicyValue &); - -@@ -258,6 +267,8 @@ - TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, PortableServer::RequestProcessingPolicyValue); - TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::RequestProcessingPolicyValue &); - -+#endif /* TAO_HAS_MINIMUM_POA == 0 */ -+ - // TAO_IDL - Generated from - // be\be_codegen.cpp:955 - ---- orig/RequestProcessingPolicyC.cpp 2005-04-11 16:44:01.633212800 +0200 -+++ RequestProcessingPolicyC.cpp 2005-04-11 16:48:45.451323200 +0200 -@@ -40,6 +40,8 @@ - // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:69 - -+#if (TAO_HAS_MINIMUM_POA == 0) -+ - // Arg traits specializations. - namespace TAO - { -@@ -211,3 +213,5 @@ - - return _tao_success; - } -+ -+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ ---- orig/RequestProcessingPolicyA.cpp 2005-04-11 16:44:01.633212800 +0200 -+++ RequestProcessingPolicyA.cpp 2005-04-11 16:48:41.295347200 +0200 -@@ -36,6 +36,8 @@ - #include "tao/Any_Impl_T.h" - #include "tao/Any_Basic_Impl_T.h" - -+#if (TAO_HAS_MINIMUM_POA == 0) -+ - // TAO_IDL - Generated from - // be\be_visitor_typecode/enum_typecode.cpp:34 - -@@ -178,3 +180,5 @@ - _tao_elem - ); - } -+ -+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/diffs/ServantActivator.diff b/TAO/tao/PortableServer/diffs/ServantActivator.diff deleted file mode 100644 index e3ba4e633a1..00000000000 --- a/TAO/tao/PortableServer/diffs/ServantActivator.diff +++ /dev/null @@ -1,54 +0,0 @@ ---- orig/ServantActivatorC.h 2005-04-11 16:44:01.853529600 +0200 -+++ ServantActivatorC.h 2005-04-11 16:44:04.597475200 +0200 -@@ -68,6 +68,8 @@ - // TAO_IDL - Generated from - // be\be_visitor_module/module_ch.cpp:48 - -+#if (TAO_HAS_MINIMUM_POA == 0) -+ - namespace PortableServer - { - -@@ -229,6 +231,8 @@ - TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantActivator_ptr *); // non-copying - TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ServantActivator_ptr &); - -+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ -+ - // TAO_IDL - Generated from - // be\be_codegen.cpp:955 - ---- orig/ServantActivatorC.cpp 2005-04-11 16:44:01.853529600 +0200 -+++ ServantActivatorC.cpp 2005-04-11 16:49:49.753785600 +0200 -@@ -41,6 +41,8 @@ - // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:69 - -+#if (TAO_HAS_MINIMUM_POA == 0) -+ - // Arg traits specializations. - namespace TAO - { -@@ -191,3 +193,5 @@ - { - return false; - } -+ -+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ ---- orig/ServantActivatorA.cpp 2005-04-11 16:44:01.853529600 +0200 -+++ ServantActivatorA.cpp 2005-04-11 16:49:46.378932800 +0200 -@@ -34,6 +34,8 @@ - #include "tao/Any.h" - #include "tao/Any_Impl_T.h" - -+#if (TAO_HAS_MINIMUM_POA == 0) -+ - // TAO_IDL - Generated from - // be\be_visitor_typecode/objref_typecode.cpp:76 - -@@ -120,3 +122,5 @@ - _tao_elem - ); - } -+ -+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/diffs/ServantLocator.diff b/TAO/tao/PortableServer/diffs/ServantLocator.diff deleted file mode 100644 index 99d7a7e6dda..00000000000 --- a/TAO/tao/PortableServer/diffs/ServantLocator.diff +++ /dev/null @@ -1,63 +0,0 @@ ---- orig/ServantLocatorC.h 2005-04-11 16:44:02.053817600 +0200 -+++ ServantLocatorC.h 2005-04-11 16:44:04.727662400 +0200 -@@ -69,6 +69,8 @@ - // TAO_IDL - Generated from - // be\be_visitor_module/module_ch.cpp:48 - -+#if (TAO_HAS_MINIMUM_POA == 0) -+ - namespace PortableServer - { - -@@ -105,6 +107,8 @@ - : public virtual ::PortableServer::ServantManager - { - public: -+ typedef void *Cookie; -+ - typedef ServantLocator_ptr _ptr_type; - typedef ServantLocator_var _var_type; - -@@ -232,6 +236,8 @@ - TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantLocator_ptr *); // non-copying - TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ServantLocator_ptr &); - -+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ -+ - // TAO_IDL - Generated from - // be\be_codegen.cpp:955 - ---- orig/ServantLocatorC.cpp 2005-04-11 16:44:02.053817600 +0200 -+++ ServantLocatorC.cpp 2005-04-11 16:50:01.380504000 +0200 -@@ -41,6 +41,8 @@ - // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:69 - -+#if (TAO_HAS_MINIMUM_POA == 0) -+ - // Arg traits specializations. - namespace TAO - { -@@ -191,3 +193,5 @@ - { - return false; - } -+ -+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ ---- orig/ServantLocatorA.cpp 2005-04-11 16:44:02.053817600 +0200 -+++ ServantLocatorA.cpp 2005-04-11 16:49:56.843980800 +0200 -@@ -35,6 +35,8 @@ - #include "tao/Any.h" - #include "tao/Any_Impl_T.h" - -+#if (TAO_HAS_MINIMUM_POA == 0) -+ - // TAO_IDL - Generated from - // be\be_visitor_typecode/objref_typecode.cpp:76 - -@@ -121,3 +123,5 @@ - _tao_elem - ); - } -+ -+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/diffs/ServantManager.diff b/TAO/tao/PortableServer/diffs/ServantManager.diff deleted file mode 100644 index 9e875a07ee1..00000000000 --- a/TAO/tao/PortableServer/diffs/ServantManager.diff +++ /dev/null @@ -1,53 +0,0 @@ ---- orig/ServantManagerC.h 2005-04-11 16:44:02.234076800 +0200 -+++ ServantManagerC.h 2005-04-11 16:44:04.827806400 +0200 -@@ -63,6 +63,8 @@ - // TAO_IDL - Generated from - // be\be_visitor_module/module_ch.cpp:48 - -+#if (TAO_HAS_MINIMUM_POA == 0) -+ - namespace PortableServer - { - -@@ -196,6 +198,8 @@ - TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantManager_ptr *); // non-copying - TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ServantManager_ptr &); - -+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ -+ - // TAO_IDL - Generated from - // be\be_codegen.cpp:955 - ---- orig/ServantManagerC.cpp 2005-04-11 16:44:02.234076800 +0200 -+++ ServantManagerC.cpp 2005-04-11 16:50:18.164638400 +0200 -@@ -45,6 +45,7 @@ - { - } - -+#if (TAO_HAS_MINIMUM_POA == 0) - - // TAO_IDL - Generated from - // be\be_visitor_interface/interface_cs.cpp:60 -@@ -186,3 +187,5 @@ - { - return false; - } -+ -+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ ---- orig/ServantManagerA.cpp 2005-04-11 16:44:02.234076800 +0200 -+++ ServantManagerA.cpp 2005-04-11 16:50:12.206070400 +0200 -@@ -34,6 +34,8 @@ - #include "tao/Any.h" - #include "tao/Any_Impl_T.h" - -+#if (TAO_HAS_MINIMUM_POA == 0) -+ - // TAO_IDL - Generated from - // be\be_visitor_typecode/objref_typecode.cpp:76 - -@@ -120,3 +122,5 @@ - _tao_elem - ); - } -+ -+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/diffs/ServantRetentionPolicy.diff b/TAO/tao/PortableServer/diffs/ServantRetentionPolicy.diff deleted file mode 100644 index 79e33f12951..00000000000 --- a/TAO/tao/PortableServer/diffs/ServantRetentionPolicy.diff +++ /dev/null @@ -1,87 +0,0 @@ ---- orig/ServantRetentionPolicyC.h 2005-04-11 16:44:02.694739200 +0200 -+++ ServantRetentionPolicyC.h 2005-04-11 16:50:59.964744000 +0200 -@@ -78,6 +78,7 @@ - NON_RETAIN - }; - -+#if (TAO_HAS_MINIMUM_POA == 0) - typedef ServantRetentionPolicyValue &ServantRetentionPolicyValue_out; - - // TAO_IDL - Generated from -@@ -207,6 +208,8 @@ - // TAO_IDL - Generated from - // be\be_visitor_module/module_ch.cpp:66 - -+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ -+ - } // module PortableServer - - // TAO_IDL - Generated from -@@ -216,6 +219,8 @@ - namespace TAO - { - -+#if (TAO_HAS_MINIMUM_POA == 0) -+ - #if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY__TRAITS_CH_) - #define _PORTABLESERVER_SERVANTRETENTIONPOLICY__TRAITS_CH_ - -@@ -236,11 +241,15 @@ - }; - - #endif /* end #if !defined */ -+ -+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ - } - - // TAO_IDL - Generated from - // be\be_visitor_enum/any_op_ch.cpp:51 - -+#if (TAO_HAS_MINIMUM_POA == 0) -+ - TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantRetentionPolicyValue); - TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ServantRetentionPolicyValue &); - -@@ -257,6 +266,8 @@ - TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, PortableServer::ServantRetentionPolicyValue); - TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ServantRetentionPolicyValue &); - -+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ -+ - // TAO_IDL - Generated from - // be\be_codegen.cpp:955 - ---- orig/ServantRetentionPolicyC.cpp 2005-04-11 16:44:02.694739200 +0200 -+++ ServantRetentionPolicyC.cpp 2005-04-11 16:50:33.026008000 +0200 -@@ -40,6 +40,8 @@ - // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:69 - -+#if (TAO_HAS_MINIMUM_POA == 0) -+ - // Arg traits specializations. - namespace TAO - { -@@ -211,3 +213,5 @@ - - return _tao_success; - } -+ -+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ ---- orig/ServantRetentionPolicyA.cpp 2005-04-11 16:44:02.694739200 +0200 -+++ ServantRetentionPolicyA.cpp 2005-04-11 16:50:28.539556800 +0200 -@@ -36,6 +36,8 @@ - #include "tao/Any_Impl_T.h" - #include "tao/Any_Basic_Impl_T.h" - -+#if (TAO_HAS_MINIMUM_POA == 0) -+ - // TAO_IDL - Generated from - // be\be_visitor_typecode/enum_typecode.cpp:34 - -@@ -177,3 +179,5 @@ - _tao_elem - ); - } -+ -+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/diffs/ThreadPolicy.diff b/TAO/tao/PortableServer/diffs/ThreadPolicy.diff deleted file mode 100644 index 2d9874e9c91..00000000000 --- a/TAO/tao/PortableServer/diffs/ThreadPolicy.diff +++ /dev/null @@ -1,88 +0,0 @@ ---- orig/ThreadPolicyC.h 2005-04-11 16:44:02.895027200 +0200 -+++ ThreadPolicyC.h 2005-04-11 16:51:37.889276800 +0200 -@@ -78,6 +78,7 @@ - SINGLE_THREAD_MODEL - }; - -+#if (TAO_HAS_MINIMUM_POA == 0) - typedef ThreadPolicyValue &ThreadPolicyValue_out; - - // TAO_IDL - Generated from -@@ -204,6 +205,8 @@ - - extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ThreadPolicy; - -+#endif /* TAO_HAS_MINIMUM_POA == 0 */ -+ - // TAO_IDL - Generated from - // be\be_visitor_module/module_ch.cpp:66 - -@@ -216,6 +219,8 @@ - namespace TAO - { - -+#if (TAO_HAS_MINIMUM_POA == 0) -+ - #if !defined (_PORTABLESERVER_THREADPOLICY__TRAITS_CH_) - #define _PORTABLESERVER_THREADPOLICY__TRAITS_CH_ - -@@ -236,11 +241,16 @@ - }; - - #endif /* end #if !defined */ -+ -+#endif /* TAO_HAS_MINIMUM_POA == 0 */ -+ - } - - // TAO_IDL - Generated from - // be\be_visitor_enum/any_op_ch.cpp:51 - -+#if (TAO_HAS_MINIMUM_POA == 0) -+ - TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ThreadPolicyValue); - TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ThreadPolicyValue &); - -@@ -257,6 +267,8 @@ - TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, PortableServer::ThreadPolicyValue); - TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ThreadPolicyValue &); - -+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ -+ - // TAO_IDL - Generated from - // be\be_codegen.cpp:955 - ---- orig/ThreadPolicyC.cpp 2005-04-11 16:44:02.895027200 +0200 -+++ ThreadPolicyC.cpp 2005-04-11 16:51:11.561419200 +0200 -@@ -40,6 +40,8 @@ - // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:69 - -+#if (TAO_HAS_MINIMUM_POA == 0) -+ - // Arg traits specializations. - namespace TAO - { -@@ -211,3 +213,5 @@ - - return _tao_success; - } -+ -+#endif /* TAO_HAS_MINIMUM_POA == 0 */ ---- orig/ThreadPolicyA.cpp 2005-04-11 16:44:02.895027200 +0200 -+++ ThreadPolicyA.cpp 2005-04-11 16:51:08.827488000 +0200 -@@ -36,6 +36,8 @@ - #include "tao/Any_Impl_T.h" - #include "tao/Any_Basic_Impl_T.h" - -+#if (TAO_HAS_MINIMUM_POA == 0) -+ - // TAO_IDL - Generated from - // be\be_visitor_typecode/enum_typecode.cpp:34 - -@@ -177,3 +179,5 @@ - _tao_elem - ); - } -+ -+#endif /* TAO_HAS_MINIMUM_POA == 0 */ diff --git a/TAO/tao/RTCORBA/RTCORBAC.h b/TAO/tao/RTCORBA/RTCORBAC.h index bcc506cc1f1..51d166c6bcf 100644 --- a/TAO/tao/RTCORBA/RTCORBAC.h +++ b/TAO/tao/RTCORBA/RTCORBAC.h @@ -599,8 +599,7 @@ namespace RTCORBA typedef TAO_Out_T< - Protocol, - Protocol_var + Protocol > Protocol_out; diff --git a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp index 9dba0b882b0..ec2c6cfbfeb 100644 --- a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp +++ b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp @@ -704,7 +704,7 @@ TAO_RT_Protocols_Hooks::get_thread_CORBA_priority (CORBA::Short &priority ACE_ENV_ARG_DECL) { CORBA::Short native_priority = 0; - int result = + int const result = this->get_thread_CORBA_and_native_priority (priority, native_priority ACE_ENV_ARG_PARAMETER); diff --git a/TAO/tao/RTCORBA/RT_Transport_Descriptor.h b/TAO/tao/RTCORBA/RT_Transport_Descriptor.h index bbf8f97ee28..7e3b2bcce33 100644 --- a/TAO/tao/RTCORBA/RT_Transport_Descriptor.h +++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor.h @@ -40,7 +40,7 @@ class TAO_RTCORBA_Export TAO_RT_Transport_Descriptor public: /// Constuctor TAO_RT_Transport_Descriptor (TAO_Endpoint *endpoint, - CORBA::Boolean flag = 0); + CORBA::Boolean flag = false); /// Destructor ~TAO_RT_Transport_Descriptor (); diff --git a/TAO/tao/RTScheduling/RTSchedulerC.cpp b/TAO/tao/RTScheduling/RTSchedulerC.cpp index 11262996eaf..bdff64666ec 100644 --- a/TAO/tao/RTScheduling/RTSchedulerC.cpp +++ b/TAO/tao/RTScheduling/RTSchedulerC.cpp @@ -59,7 +59,7 @@ namespace TAO : public Var_Size_Arg_Traits_T< CORBA::PolicyList, - TAO::Any_Insert_Policy_Stream <CORBA::PolicyList> + TAO::Any_Insert_Policy_Stream > { }; diff --git a/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.cpp b/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.cpp index 4a9822dc7b5..c973cee3a80 100644 --- a/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.cpp +++ b/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.cpp @@ -17,10 +17,6 @@ TAO_FIFO_Connection_Purging_Strategy::TAO_FIFO_Connection_Purging_Strategy ( { } -TAO_FIFO_Connection_Purging_Strategy::~TAO_FIFO_Connection_Purging_Strategy (void) -{ -} - void TAO_FIFO_Connection_Purging_Strategy::update_item (TAO_Transport* transport) { diff --git a/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.h b/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.h index 30ef3794a5c..5deda35a567 100644 --- a/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.h +++ b/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.h @@ -43,9 +43,6 @@ public: /// The constructor TAO_FIFO_Connection_Purging_Strategy (int cache_maximum); - /// The destructor - virtual ~TAO_FIFO_Connection_Purging_Strategy (void); - /// Called when accessing an item from the cache virtual void update_item (TAO_Transport* transport); diff --git a/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.cpp b/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.cpp index eab9bc1f9e0..c254f148637 100644 --- a/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.cpp +++ b/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.cpp @@ -14,11 +14,6 @@ TAO_LFU_Connection_Purging_Strategy::TAO_LFU_Connection_Purging_Strategy ( { } - -TAO_LFU_Connection_Purging_Strategy::~TAO_LFU_Connection_Purging_Strategy (void) -{ -} - void TAO_LFU_Connection_Purging_Strategy::update_item (TAO_Transport* transport) { diff --git a/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.h b/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.h index 98ea59231f9..a0a6afbccaf 100644 --- a/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.h +++ b/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.h @@ -42,9 +42,6 @@ public: /// The constructor TAO_LFU_Connection_Purging_Strategy (int cache_maximum); - /// The destructor - virtual ~TAO_LFU_Connection_Purging_Strategy (void); - /// Called when accessing an item from the cache virtual void update_item (TAO_Transport* transport); }; diff --git a/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.cpp b/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.cpp index 181be613d77..4c49b8ee312 100644 --- a/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.cpp +++ b/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.cpp @@ -13,14 +13,9 @@ TAO_NULL_Connection_Purging_Strategy::TAO_NULL_Connection_Purging_Strategy ( { } -TAO_NULL_Connection_Purging_Strategy::~TAO_NULL_Connection_Purging_Strategy (void) -{ -} - void -TAO_NULL_Connection_Purging_Strategy::update_item (TAO_Transport* transport) +TAO_NULL_Connection_Purging_Strategy::update_item (TAO_Transport*) { - ACE_UNUSED_ARG (transport); } int diff --git a/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.h b/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.h index 37b5c15d268..2da2ceb6e0e 100644 --- a/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.h +++ b/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.h @@ -39,9 +39,6 @@ public: /// The constructor TAO_NULL_Connection_Purging_Strategy (int cache_maximum); - /// The destructor - virtual ~TAO_NULL_Connection_Purging_Strategy (void); - /// Does nothing. virtual void update_item (TAO_Transport* transport); diff --git a/TAO/tao/Strategies/sciop_endpointsC.h b/TAO/tao/Strategies/sciop_endpointsC.h index 634b4d3ff28..a9dd5ce773c 100644 --- a/TAO/tao/Strategies/sciop_endpointsC.h +++ b/TAO/tao/Strategies/sciop_endpointsC.h @@ -78,8 +78,7 @@ typedef typedef TAO_Out_T< - TAO_SCIOP_Endpoint_Info, - TAO_SCIOP_Endpoint_Info_var + TAO_SCIOP_Endpoint_Info > TAO_SCIOP_Endpoint_Info_out; diff --git a/TAO/tao/Strategies/uiop_endpointsC.h b/TAO/tao/Strategies/uiop_endpointsC.h index 67b93a85845..b09285b2cf5 100644 --- a/TAO/tao/Strategies/uiop_endpointsC.h +++ b/TAO/tao/Strategies/uiop_endpointsC.h @@ -78,8 +78,7 @@ typedef typedef TAO_Out_T< - TAO_UIOP_Endpoint_Info, - TAO_UIOP_Endpoint_Info_var + TAO_UIOP_Endpoint_Info > TAO_UIOP_Endpoint_Info_out; diff --git a/TAO/tao/TypeCodeFactory.mpc b/TAO/tao/TypeCodeFactory.mpc index d84aece5bf6..800a4e5b1be 100644 --- a/TAO/tao/TypeCodeFactory.mpc +++ b/TAO/tao/TypeCodeFactory.mpc @@ -1,5 +1,5 @@ //$Id$ -project : taolib, core, ifr_client { +project : taolib, core, ifr_client, tao_versioning_idl_defaults { sharedname = TAO_TypeCodeFactory dynamicflags = TAO_TYPECODEFACTORY_BUILD_DLL @@ -28,6 +28,9 @@ project : taolib, core, ifr_client { } IDL_Files { + idlflags += -SS -Sci -Ge 1 -Sorb -I$(TAO_ROOT) -Wb,export_macro=TAO_TypeCodeFactory_Export -Wb,export_include="tao/TypeCodeFactory/typecodefactory_export.h" -o TypeCodeFactory + idlflags -= -Sa -St + TypeCodeFactory/TypeCodeFactory.pidl } Pkgconfig_Files { diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory.pidl b/TAO/tao/TypeCodeFactory/TypeCodeFactory.pidl index 40521cc0d60..365decca637 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory.pidl +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory.pidl @@ -1,55 +1,16 @@ // // $Id$ -// -// ================================================================ -// -// = LIBRARY -// TAO/tao/TypeCodeFactory -// -// = FILENAME -// TypeCodeFactory.pidl -// -// = DESCRIPTION -// This file was used to generate the code in TypeCodeFactoryC.{h,i,cpp}. -// It was originally part of Interface.idl, but since the TypeCodeFactory -// has been made into a separate library, and the TypeCodeFactory interface -// has been made local, it is simpler to generate the necessary stub -// code in TypeCodeFactoryC.* by splitting Interface.idl into two -// parts. -// -// 1. Patch this pidl file with -// -// patch < diffs/TypeCodeFactory.pidl.diff -// -// This will remove the CORBA module, rename most types foo -// declared in it as CORBA_foo, unalias the simple typedefs -// which don't have a CORBA_ analog in corbafwd.h. -// -// 2. Generate the code. The command used to generate code from this -// IDL file is: -// -// tao_idl -o orig -Ge 1 -I../.. -Sci \ -// -Wb,export_macro=TAO_TypeCodeFactory_Export \ -// -Wb,export_include=typecodefactory_export.h \ -// -Wb,pre_include="ace/pre.h" \ -// -Wb,post_include="ace/post.h" \ -// TypeCodeFactory.pidl -// -// 3. Copy the generated files to the current directory. -// -// 4. Patch the generated files, using -// -// patch < diffs/TypeCodeFactoryC.h.diff -// patch < diffs/TypeCodeFactoryC.cpp.diff -// -// If this fails for some reason, the files must be patched -// by hand, and the diff files regenerated with -// -// diff -wbu orig/TypeCodeFactoryC.h TypeCodeFactoryC.h > diffs/TypeCodeFactoryC.h.diff -// diff -wbu orig/TypeCodeFactoryC.cpp TypeCodeFactoryC.cpp > diffs/TypeCodeFactoryC.cpp.diff -// -// 5. Restore TypeCodeFactory.pidl. -// + +/** + * @file TypeCodeFactory.pidl + * + * It was originally part of Interface.idl, but since the TypeCodeFactory + * has been made into a separate library, and the TypeCodeFactory interface + * has been made local, it is simpler to generate the necessary stub + * code in TypeCodeFactoryC.* by splitting Interface.idl into two + * parts. + */ + // ================================================================ #ifndef _TYPECODEFACTORY_IDL_ diff --git a/TAO/tao/Valuetype.mpc b/TAO/tao/Valuetype.mpc index 6bfb0d11794..77865c4ed0c 100644 --- a/TAO/tao/Valuetype.mpc +++ b/TAO/tao/Valuetype.mpc @@ -1,5 +1,5 @@ //$Id$ -project : taolib, core, core_anytypecode { +project : taolib, core, core_anytypecode, tao_versioning_idl_defaults { sharedname = TAO_Valuetype dynamicflags = TAO_VALUETYPE_BUILD_DLL @@ -26,6 +26,12 @@ project : taolib, core, core_anytypecode { PIDL_Files { } + IDL_Files { + idlflags += -SS -Ge 1 -Sorb -I$(TAO_ROOT) -Wb,export_macro=TAO_Valuetype_Export -Wb,export_include="tao/Valuetype/valuetype_export.h" -Wb,pre_include="ace/pre.h" -Wb,post_include="ace/post.h" -o Valuetype + idlflags -= -Sa -St + Valuetype/StringValue.pidl + } + Pkgconfig_Files { Valuetype/TAO_Valuetype.pc.in } diff --git a/TAO/tao/Valuetype/AbstractBase.cpp b/TAO/tao/Valuetype/AbstractBase.cpp index 8fdaae3432a..21ad8fa4664 100644 --- a/TAO/tao/Valuetype/AbstractBase.cpp +++ b/TAO/tao/Valuetype/AbstractBase.cpp @@ -40,11 +40,11 @@ CORBA::is_nil (CORBA::AbstractBase_ptr obj) // ************************************************************ CORBA::AbstractBase::AbstractBase (void) - : is_objref_ (0) + : is_objref_ (false) , concrete_stubobj_ (0) - , is_collocated_ (0) + , is_collocated_ (false) , servant_ (0) - , is_local_ (0) + , is_local_ (false) , equivalent_obj_ (0) { } @@ -72,11 +72,11 @@ CORBA::AbstractBase::AbstractBase (const CORBA::AbstractBase &rhs) CORBA::AbstractBase::AbstractBase (TAO_Stub * protocol_proxy, CORBA::Boolean collocated, TAO_Abstract_ServantBase * servant) - : is_objref_ (1) + : is_objref_ (true) , concrete_stubobj_ (protocol_proxy) , is_collocated_ (collocated) , servant_ (servant) - , is_local_ (protocol_proxy == 0 ? 1 : 0) + , is_local_ (protocol_proxy == 0 ? true : false) , equivalent_obj_ (0) { if (this->concrete_stubobj_ != 0) diff --git a/TAO/tao/Valuetype/AbstractBase.h b/TAO/tao/Valuetype/AbstractBase.h index d897139f8ed..fab7f75622a 100644 --- a/TAO/tao/Valuetype/AbstractBase.h +++ b/TAO/tao/Valuetype/AbstractBase.h @@ -127,7 +127,6 @@ namespace CORBA CORBA::Boolean is_objref_; - private: AbstractBase & operator= (const AbstractBase &); @@ -164,7 +163,7 @@ namespace TAO CORBA::AbstractBase_var, CORBA::AbstractBase_out, TAO::Objref_Traits<CORBA::AbstractBase>, - TAO::Any_Insert_Policy_Stream <CORBA::AbstractBase_ptr> + TAO::Any_Insert_Policy_Stream > { }; diff --git a/TAO/tao/Valuetype/AbstractBase_T.cpp b/TAO/tao/Valuetype/AbstractBase_T.cpp index 8a9f0cdc70f..ff9f03fa562 100644 --- a/TAO/tao/Valuetype/AbstractBase_T.cpp +++ b/TAO/tao/Valuetype/AbstractBase_T.cpp @@ -23,14 +23,14 @@ namespace TAO return T::_nil (); } - CORBA::Boolean is_it = + CORBA::Boolean const is_it = obj->_is_a ( repo_id ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (T::_nil ()); - if (is_it == 0) + if (is_it == false) { return T::_nil (); } @@ -91,7 +91,7 @@ namespace TAO { TAO_Stub* stub = obj->_stubobj (); - bool collocated = + bool const collocated = !CORBA::is_nil (stub->servant_orb_var ().in ()) && stub->optimize_collocation_objects () && obj->_is_collocated () diff --git a/TAO/tao/Valuetype/StringValue.pidl b/TAO/tao/Valuetype/StringValue.pidl index c4969b4b35b..fd31cd3a930 100644 --- a/TAO/tao/Valuetype/StringValue.pidl +++ b/TAO/tao/Valuetype/StringValue.pidl @@ -3,20 +3,8 @@ // $Id$ // ================================================================ -// // Standard Value Box Definitions // as specified in OMG document formal/01-12-35 -// -// This file was used to generate the code in StringValueC.* -// The command used to generate code is: -// -// tao_idl -Ge 1 -GT -// -Wb,export_macro=TAO_Valuetype_Export -// -Wb,export_include=valuetype_export.h -// -Wb,pre_include="ace/pre.h" -// -Wb,post_include="ace/post.h" -// StringValue.pidl -// // ================================================================ diff --git a/TAO/tao/Valuetype/ValueBase.h b/TAO/tao/Valuetype/ValueBase.h index 44f7598672a..3c2f5d3aac9 100644 --- a/TAO/tao/Valuetype/ValueBase.h +++ b/TAO/tao/Valuetype/ValueBase.h @@ -134,6 +134,7 @@ namespace CORBA // Reference counting. /// %! virtual CORBA::ValueBase* _copy_value (void) = 0; + virtual void _add_ref (void) = 0; virtual void _remove_ref (void) = 0; virtual CORBA::ULong _refcount_value (void) = 0; @@ -344,8 +345,7 @@ namespace TAO CORBA::ValueBase_var, CORBA::ValueBase_out, TAO::Value_Traits<CORBA::ValueBase>, - TAO::Any_Insert_Policy_Stream <CORBA::ValueBase *> - > + TAO::Any_Insert_Policy_Stream> { }; diff --git a/TAO/tao/tao.mpc b/TAO/tao/tao.mpc index 1774115bbae..4723b826b84 100644 --- a/TAO/tao/tao.mpc +++ b/TAO/tao/tao.mpc @@ -126,6 +126,7 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core { MCAST_Parser.cpp Messaging_PolicyValueC.cpp Messaging_SyncScopeC.cpp + MMAP_Allocator.cpp MProfile.cpp Muxed_TMS.cpp New_Leader_Generator.cpp @@ -402,6 +403,7 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core { MCAST_Parser.h Messaging_PolicyValueC.h Messaging_SyncScopeC.h + MMAP_Allocator.h MProfile.h Muxed_TMS.h New_Leader_Generator.h |