diff options
| author | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-06-18 08:47:16 +0000 |
|---|---|---|
| committer | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-06-18 08:47:16 +0000 |
| commit | e2c7ec09c8eee29e22b32370f66cc70853f82e73 (patch) | |
| tree | 053a054e26c3a29228c669f682b179b6c091a2b7 /TAO | |
| parent | 18be69533bc7f11ba578e4252b9b4dfea629e86b (diff) | |
| download | ATCD-e2c7ec09c8eee29e22b32370f66cc70853f82e73.tar.gz | |
ChangeLogTag:Sun Jun 18 03:18:08 2000 Nanbor Wang <nanbor@cs.wustl.edu>
Diffstat (limited to 'TAO')
35 files changed, 473 insertions, 429 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index ec1c73d3068..9bb7918ab21 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,48 @@ +Sun Jun 18 03:18:08 2000 Nanbor Wang <nanbor@cs.wustl.edu> + + * TAO_IDL/be/be_visitor_operation/operation_cs.cpp: + * TAO_IDL/be/be_visitor_operation/operation_ss.cpp: + * examples/Quoter/server.cpp: + * orbsvcs/IFR_Service/TypeCodeFactory_skel.cpp: + * orbsvcs/ImplRepo_Service/ImplRepo_i.cpp: + * orbsvcs/orbsvcs/AV/AVStreams_i.cpp: + * orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp: + * orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp: + * orbsvcs/orbsvcs/Notify/Notify_Filter_i.cpp: + * orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.cpp: + * orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.cpp: + * orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.cpp: + * orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp: + * orbsvcs/tests/AVStreams/mpeg/source/server/Property_Exporter.cpp: + * orbsvcs/tests/Concurrency/CC_command.cpp: + * orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp: + * orbsvcs/tests/EC_Multiple/EC_Multiple.cpp: + * orbsvcs/tests/ImplRepo/airplane_server_i.cpp: + * orbsvcs/tests/ImplRepo/nestea_server_i.cpp: + * orbsvcs/tests/Simple_Naming/client.cpp: + * orbsvcs/tests/Trading/Offer_Exporter.cpp: + * orbsvcs/tests/Trading/Offer_Importer.cpp: + * orbsvcs/tests/Trading/Service_Type_Exporter.cpp: + * performance-tests/POA/Demux/demux_test_client.cpp: + * performance-tests/POA/Demux/demux_test_server.cpp: + * tao/ImplRepoC.cpp: + * tao/ImplRepoS.cpp: + * tao/InterfaceC.cpp: + * tao/Invocation.cpp: + * tao/ORB.cpp: + * tao/Object.cpp: + * tests/MProfile/client.cpp: + * tests/MProfile_Forwarding/client.cpp : Replaced ACE_RETHROW + with appropriate ACE_RE_THROW/ACE_RE_THROW_EX. See ACE + ChangeLog entry: + + Sun Jun 18 03:18:21 2000 Nanbor Wang <nanbor@cs.wustl.edu> + + for more information. + + * examples/Simple/time/Time_Client.java: The time interface has + changed to use <current_time> to acquire time instead of <time>. + Sun Jun 18 00:01:28 2000 Marina Spivak <marina@cs.wustl.edu> * tao/Encodable.h diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp index 65f2b5a5b44..a69af0878fc 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp @@ -717,7 +717,7 @@ be_visitor_operation_cs::gen_marshal_and_invoke (be_operation *node, if (idl_global->use_raw_throw ()) *os << "throw;" << be_uidt_nl; else - *os << "ACE_RETHROW;" << be_uidt_nl; + *os << "ACE_RE_THROW;" << be_uidt_nl; *os << "}" << be_uidt_nl << "ACE_ENDTRY;\n"; diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp index 6df723e888d..4561077c147 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp @@ -286,7 +286,7 @@ be_visitor_operation_ss::visit_operation (be_operation *node) if (idl_global->use_raw_throw ()) *os << "throw;" << be_uidt_nl; else - *os << "ACE_RETHROW;" << be_uidt_nl; + *os << "ACE_RE_THROW;" << be_uidt_nl; *os << "}" << be_uidt_nl << "ACE_ENDTRY;" << be_nl; @@ -571,7 +571,7 @@ be_visitor_operation_ss::gen_raise_exception (be_type *, } int -be_visitor_operation_ss::gen_check_exception (be_type *, +be_visitor_operation_ss::gen_check_exception (be_type *, const char * /* env */) { TAO_OutStream *os = this->ctx_->stream (); diff --git a/TAO/examples/Quoter/server.cpp b/TAO/examples/Quoter/server.cpp index df96d85135d..c52c57ff0bd 100644 --- a/TAO/examples/Quoter/server.cpp +++ b/TAO/examples/Quoter/server.cpp @@ -140,7 +140,7 @@ Quoter_Server::init (int argc, { ACE_ERROR ((LM_ERROR, "Quote_Server::init - %s\n", exception_message)); ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception"); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; diff --git a/TAO/examples/Simple/time/Time_Client.java b/TAO/examples/Simple/time/Time_Client.java index 3596535d7c8..77c837a2b5c 100644 --- a/TAO/examples/Simple/time/Time_Client.java +++ b/TAO/examples/Simple/time/Time_Client.java @@ -132,7 +132,7 @@ public class Time_Client } // Call the Time server object and print results. - int time = timeRef.time (); + int time = timeRef.current_time (); java.util.Date date = new java.util.Date (((long) time) * 1000); diff --git a/TAO/orbsvcs/IFR_Service/TypeCodeFactory_skel.cpp b/TAO/orbsvcs/IFR_Service/TypeCodeFactory_skel.cpp index f48924b4690..ae8896e9ce5 100644 --- a/TAO/orbsvcs/IFR_Service/TypeCodeFactory_skel.cpp +++ b/TAO/orbsvcs/IFR_Service/TypeCodeFactory_skel.cpp @@ -10,7 +10,7 @@ // Since the TypeCode factory needs to be available whether or not // the Interface Repository is available, the skeleton code -// specific to the TypeCode factory (generated by Interface.idl) +// specific to the TypeCode factory (generated by Interface.idl) // has been separated, removed from the TAO library. and included // here. @@ -104,31 +104,31 @@ TAO_CORBA_TypeCodeFactory_Perfect_Hash_OpTable::lookup (const char *str, unsigne {"",0},{"",0},{"",0},{"",0},{"",0}, {"_is_a", &POA_CORBA::TypeCodeFactory::_is_a_skel}, {"_non_existent", &POA_CORBA::TypeCodeFactory::_non_existent_skel}, - {"create_enum_tc", &POA_CORBA::TypeCodeFactory::create_enum_tc_skel}, - {"create_home_tc", &POA_CORBA::TypeCodeFactory::create_home_tc_skel}, - {"create_union_tc", &POA_CORBA::TypeCodeFactory::create_union_tc_skel}, - {"create_value_tc", &POA_CORBA::TypeCodeFactory::create_value_tc_skel}, - {"create_array_tc", &POA_CORBA::TypeCodeFactory::create_array_tc_skel}, - {"create_fixed_tc", &POA_CORBA::TypeCodeFactory::create_fixed_tc_skel}, - {"create_alias_tc", &POA_CORBA::TypeCodeFactory::create_alias_tc_skel}, - {"create_struct_tc", &POA_CORBA::TypeCodeFactory::create_struct_tc_skel}, - {"create_native_tc", &POA_CORBA::TypeCodeFactory::create_native_tc_skel}, - {"create_string_tc", &POA_CORBA::TypeCodeFactory::create_string_tc_skel}, - {"create_wstring_tc", &POA_CORBA::TypeCodeFactory::create_wstring_tc_skel}, - {"create_sequence_tc", &POA_CORBA::TypeCodeFactory::create_sequence_tc_skel}, - {"create_exception_tc", &POA_CORBA::TypeCodeFactory::create_exception_tc_skel}, - {"create_component_tc", &POA_CORBA::TypeCodeFactory::create_component_tc_skel}, - {"create_recursive_tc", &POA_CORBA::TypeCodeFactory::create_recursive_tc_skel}, - {"create_value_box_tc", &POA_CORBA::TypeCodeFactory::create_value_box_tc_skel}, - {"create_interface_tc", &POA_CORBA::TypeCodeFactory::create_interface_tc_skel}, - {"create_abstract_interface_tc", &POA_CORBA::TypeCodeFactory::create_abstract_interface_tc_skel}, + {"create_enum_tc", &POA_CORBA::TypeCodeFactory::create_enum_tc_skel}, + {"create_home_tc", &POA_CORBA::TypeCodeFactory::create_home_tc_skel}, + {"create_union_tc", &POA_CORBA::TypeCodeFactory::create_union_tc_skel}, + {"create_value_tc", &POA_CORBA::TypeCodeFactory::create_value_tc_skel}, + {"create_array_tc", &POA_CORBA::TypeCodeFactory::create_array_tc_skel}, + {"create_fixed_tc", &POA_CORBA::TypeCodeFactory::create_fixed_tc_skel}, + {"create_alias_tc", &POA_CORBA::TypeCodeFactory::create_alias_tc_skel}, + {"create_struct_tc", &POA_CORBA::TypeCodeFactory::create_struct_tc_skel}, + {"create_native_tc", &POA_CORBA::TypeCodeFactory::create_native_tc_skel}, + {"create_string_tc", &POA_CORBA::TypeCodeFactory::create_string_tc_skel}, + {"create_wstring_tc", &POA_CORBA::TypeCodeFactory::create_wstring_tc_skel}, + {"create_sequence_tc", &POA_CORBA::TypeCodeFactory::create_sequence_tc_skel}, + {"create_exception_tc", &POA_CORBA::TypeCodeFactory::create_exception_tc_skel}, + {"create_component_tc", &POA_CORBA::TypeCodeFactory::create_component_tc_skel}, + {"create_recursive_tc", &POA_CORBA::TypeCodeFactory::create_recursive_tc_skel}, + {"create_value_box_tc", &POA_CORBA::TypeCodeFactory::create_value_box_tc_skel}, + {"create_interface_tc", &POA_CORBA::TypeCodeFactory::create_interface_tc_skel}, + {"create_abstract_interface_tc", &POA_CORBA::TypeCodeFactory::create_abstract_interface_tc_skel}, }; static const signed char lookup[] = { - -1, -1, -1, -7, -2, 5, -1, -9, -5, -14, -3, -19, -5, 6, - -39, -36, -35, 17, 18, -36, -1, -1, -1, -1, -1, -1, -1, -1, - 24, + -1, -1, -1, -7, -2, 5, -1, -9, -5, -14, -3, -19, -5, 6, + -39, -36, -35, 17, 18, -36, -1, -1, -1, -1, -1, -1, -1, -1, + 24, }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) @@ -170,7 +170,7 @@ CORBA::TypeCodeFactory_ptr _TAO_collocation_POA_CORBA_TypeCodeFactory_Stub_Facto ) { TAO_Stub *stub = obj->_stubobj (); - + switch (stub->servant_orb_var ()->orb_core ()->get_collocation_strategy ()) { case TAO_ORB_Core::THRU_POA: @@ -194,14 +194,14 @@ CORBA::TypeCodeFactory_ptr _TAO_collocation_POA_CORBA_TypeCodeFactory_Stub_Facto int _TAO_collocation_POA_CORBA_TypeCodeFactory_Stub_Factory_Initializer (long dummy) { ACE_UNUSED_ARG (dummy); - - _TAO_collocation_CORBA_TypeCodeFactory_Stub_Factory_function_pointer = + + _TAO_collocation_CORBA_TypeCodeFactory_Stub_Factory_function_pointer = _TAO_collocation_POA_CORBA_TypeCodeFactory_Stub_Factory; - + return 0; } -static int _TAO_collocation_POA_CORBA_TypeCodeFactory_Stub_Factory_Initializer_Scarecrow = +static int _TAO_collocation_POA_CORBA_TypeCodeFactory_Stub_Factory_Initializer_Scarecrow = _TAO_collocation_POA_CORBA_TypeCodeFactory_Stub_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_collocation_POA_CORBA_TypeCodeFactory_Stub_Factory_Initializer)); // skeleton constructor @@ -222,8 +222,8 @@ POA_CORBA::TypeCodeFactory::~TypeCodeFactory (void) void POA_CORBA::TypeCodeFactory::create_struct_tc_skel ( CORBA::ServerRequest &_tao_server_request, - void *_tao_object_reference, - void * /* context */, + void *_tao_object_reference, + void * /* context */, CORBA::Environment &ACE_TRY_ENV ) { @@ -304,7 +304,7 @@ void POA_CORBA::TypeCodeFactory::create_struct_tc_skel ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -322,8 +322,8 @@ void POA_CORBA::TypeCodeFactory::create_struct_tc_skel ( void POA_CORBA::TypeCodeFactory::create_union_tc_skel ( CORBA::ServerRequest &_tao_server_request, - void *_tao_object_reference, - void * /* context */, + void *_tao_object_reference, + void * /* context */, CORBA::Environment &ACE_TRY_ENV ) { @@ -407,7 +407,7 @@ void POA_CORBA::TypeCodeFactory::create_union_tc_skel ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -425,8 +425,8 @@ void POA_CORBA::TypeCodeFactory::create_union_tc_skel ( void POA_CORBA::TypeCodeFactory::create_enum_tc_skel ( CORBA::ServerRequest &_tao_server_request, - void *_tao_object_reference, - void * /* context */, + void *_tao_object_reference, + void * /* context */, CORBA::Environment &ACE_TRY_ENV ) { @@ -507,7 +507,7 @@ void POA_CORBA::TypeCodeFactory::create_enum_tc_skel ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -525,8 +525,8 @@ void POA_CORBA::TypeCodeFactory::create_enum_tc_skel ( void POA_CORBA::TypeCodeFactory::create_alias_tc_skel ( CORBA::ServerRequest &_tao_server_request, - void *_tao_object_reference, - void * /* context */, + void *_tao_object_reference, + void * /* context */, CORBA::Environment &ACE_TRY_ENV ) { @@ -607,7 +607,7 @@ void POA_CORBA::TypeCodeFactory::create_alias_tc_skel ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -625,8 +625,8 @@ void POA_CORBA::TypeCodeFactory::create_alias_tc_skel ( void POA_CORBA::TypeCodeFactory::create_exception_tc_skel ( CORBA::ServerRequest &_tao_server_request, - void *_tao_object_reference, - void * /* context */, + void *_tao_object_reference, + void * /* context */, CORBA::Environment &ACE_TRY_ENV ) { @@ -707,7 +707,7 @@ void POA_CORBA::TypeCodeFactory::create_exception_tc_skel ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -725,8 +725,8 @@ void POA_CORBA::TypeCodeFactory::create_exception_tc_skel ( void POA_CORBA::TypeCodeFactory::create_interface_tc_skel ( CORBA::ServerRequest &_tao_server_request, - void *_tao_object_reference, - void * /* context */, + void *_tao_object_reference, + void * /* context */, CORBA::Environment &ACE_TRY_ENV ) { @@ -804,7 +804,7 @@ void POA_CORBA::TypeCodeFactory::create_interface_tc_skel ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -822,8 +822,8 @@ void POA_CORBA::TypeCodeFactory::create_interface_tc_skel ( void POA_CORBA::TypeCodeFactory::create_string_tc_skel ( CORBA::ServerRequest &_tao_server_request, - void *_tao_object_reference, - void * /* context */, + void *_tao_object_reference, + void * /* context */, CORBA::Environment &ACE_TRY_ENV ) { @@ -898,7 +898,7 @@ void POA_CORBA::TypeCodeFactory::create_string_tc_skel ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -916,8 +916,8 @@ void POA_CORBA::TypeCodeFactory::create_string_tc_skel ( void POA_CORBA::TypeCodeFactory::create_wstring_tc_skel ( CORBA::ServerRequest &_tao_server_request, - void *_tao_object_reference, - void * /* context */, + void *_tao_object_reference, + void * /* context */, CORBA::Environment &ACE_TRY_ENV ) { @@ -992,7 +992,7 @@ void POA_CORBA::TypeCodeFactory::create_wstring_tc_skel ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -1010,8 +1010,8 @@ void POA_CORBA::TypeCodeFactory::create_wstring_tc_skel ( void POA_CORBA::TypeCodeFactory::create_fixed_tc_skel ( CORBA::ServerRequest &_tao_server_request, - void *_tao_object_reference, - void * /* context */, + void *_tao_object_reference, + void * /* context */, CORBA::Environment &ACE_TRY_ENV ) { @@ -1089,7 +1089,7 @@ void POA_CORBA::TypeCodeFactory::create_fixed_tc_skel ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -1107,8 +1107,8 @@ void POA_CORBA::TypeCodeFactory::create_fixed_tc_skel ( void POA_CORBA::TypeCodeFactory::create_sequence_tc_skel ( CORBA::ServerRequest &_tao_server_request, - void *_tao_object_reference, - void * /* context */, + void *_tao_object_reference, + void * /* context */, CORBA::Environment &ACE_TRY_ENV ) { @@ -1186,7 +1186,7 @@ void POA_CORBA::TypeCodeFactory::create_sequence_tc_skel ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -1204,8 +1204,8 @@ void POA_CORBA::TypeCodeFactory::create_sequence_tc_skel ( void POA_CORBA::TypeCodeFactory::create_array_tc_skel ( CORBA::ServerRequest &_tao_server_request, - void *_tao_object_reference, - void * /* context */, + void *_tao_object_reference, + void * /* context */, CORBA::Environment &ACE_TRY_ENV ) { @@ -1283,7 +1283,7 @@ void POA_CORBA::TypeCodeFactory::create_array_tc_skel ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -1301,8 +1301,8 @@ void POA_CORBA::TypeCodeFactory::create_array_tc_skel ( void POA_CORBA::TypeCodeFactory::create_value_tc_skel ( CORBA::ServerRequest &_tao_server_request, - void *_tao_object_reference, - void * /* context */, + void *_tao_object_reference, + void * /* context */, CORBA::Environment &ACE_TRY_ENV ) { @@ -1389,7 +1389,7 @@ void POA_CORBA::TypeCodeFactory::create_value_tc_skel ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -1407,8 +1407,8 @@ void POA_CORBA::TypeCodeFactory::create_value_tc_skel ( void POA_CORBA::TypeCodeFactory::create_value_box_tc_skel ( CORBA::ServerRequest &_tao_server_request, - void *_tao_object_reference, - void * /* context */, + void *_tao_object_reference, + void * /* context */, CORBA::Environment &ACE_TRY_ENV ) { @@ -1489,7 +1489,7 @@ void POA_CORBA::TypeCodeFactory::create_value_box_tc_skel ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -1507,8 +1507,8 @@ void POA_CORBA::TypeCodeFactory::create_value_box_tc_skel ( void POA_CORBA::TypeCodeFactory::create_native_tc_skel ( CORBA::ServerRequest &_tao_server_request, - void *_tao_object_reference, - void * /* context */, + void *_tao_object_reference, + void * /* context */, CORBA::Environment &ACE_TRY_ENV ) { @@ -1586,7 +1586,7 @@ void POA_CORBA::TypeCodeFactory::create_native_tc_skel ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -1604,8 +1604,8 @@ void POA_CORBA::TypeCodeFactory::create_native_tc_skel ( void POA_CORBA::TypeCodeFactory::create_recursive_tc_skel ( CORBA::ServerRequest &_tao_server_request, - void *_tao_object_reference, - void * /* context */, + void *_tao_object_reference, + void * /* context */, CORBA::Environment &ACE_TRY_ENV ) { @@ -1680,7 +1680,7 @@ void POA_CORBA::TypeCodeFactory::create_recursive_tc_skel ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -1698,8 +1698,8 @@ void POA_CORBA::TypeCodeFactory::create_recursive_tc_skel ( void POA_CORBA::TypeCodeFactory::create_abstract_interface_tc_skel ( CORBA::ServerRequest &_tao_server_request, - void *_tao_object_reference, - void * /* context */, + void *_tao_object_reference, + void * /* context */, CORBA::Environment &ACE_TRY_ENV ) { @@ -1777,7 +1777,7 @@ void POA_CORBA::TypeCodeFactory::create_abstract_interface_tc_skel ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -1795,8 +1795,8 @@ void POA_CORBA::TypeCodeFactory::create_abstract_interface_tc_skel ( void POA_CORBA::TypeCodeFactory::create_component_tc_skel ( CORBA::ServerRequest &_tao_server_request, - void *_tao_object_reference, - void * /* context */, + void *_tao_object_reference, + void * /* context */, CORBA::Environment &ACE_TRY_ENV ) { @@ -1874,7 +1874,7 @@ void POA_CORBA::TypeCodeFactory::create_component_tc_skel ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -1892,8 +1892,8 @@ void POA_CORBA::TypeCodeFactory::create_component_tc_skel ( void POA_CORBA::TypeCodeFactory::create_home_tc_skel ( CORBA::ServerRequest &_tao_server_request, - void *_tao_object_reference, - void * /* context */, + void *_tao_object_reference, + void * /* context */, CORBA::Environment &ACE_TRY_ENV ) { @@ -1971,7 +1971,7 @@ void POA_CORBA::TypeCodeFactory::create_home_tc_skel ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -1988,7 +1988,7 @@ void POA_CORBA::TypeCodeFactory::create_home_tc_skel ( } void POA_CORBA::TypeCodeFactory::_is_a_skel ( - CORBA::ServerRequest &_tao_server_request, + CORBA::ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* context */, CORBA::Environment &ACE_TRY_ENV @@ -2000,10 +2000,10 @@ void POA_CORBA::TypeCodeFactory::_is_a_skel ( CORBA::String_var value; if (!((_tao_in >> value.out ()))) ACE_THROW (CORBA::MARSHAL ()); - + _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (ACE_TRY_ENV); ACE_CHECK; TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); @@ -2012,7 +2012,7 @@ void POA_CORBA::TypeCodeFactory::_is_a_skel ( } void POA_CORBA::TypeCodeFactory::_non_existent_skel ( - CORBA::ServerRequest &_tao_server_request, + CORBA::ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* context */, CORBA::Environment &ACE_TRY_ENV @@ -2021,7 +2021,7 @@ void POA_CORBA::TypeCodeFactory::_non_existent_skel ( POA_CORBA::TypeCodeFactory *_tao_impl = (POA_CORBA::TypeCodeFactory *) _tao_object_reference; CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (ACE_TRY_ENV); ACE_CHECK; TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); @@ -2766,4 +2766,3 @@ CORBA::TypeCode_ptr POA_CORBA::_tao_thru_poa_collocated_TypeCodeFactory::create_ ); } - diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp index 637bb80c3f2..0635c3d29ab 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp @@ -216,7 +216,7 @@ ImplRepo_i::activate_server_i (const char *server, ACE_THROW_RETURN (CORBA::TRANSIENT ( CORBA_SystemException::_tao_minor_code ( TAO_IMPLREPO_SERVER_MANUAL_ACTIVATION, 0), - CORBA::COMPLETED_NO), + CORBA::COMPLETED_NO), ""); this->start_server_i (server); @@ -291,7 +291,7 @@ ImplRepo_i::start_server_i (const char *server, ACE_ERROR ((LM_ERROR, "Error: No startup information for server <%s>\n", server)); - ACE_THROW (ImplementationRepository::Administration::CannotActivate + ACE_THROW (ImplementationRepository::Administration::CannotActivate (CORBA::string_dup ("No startup information"))); ACE_CHECK; } @@ -316,7 +316,7 @@ ImplRepo_i::start_server_i (const char *server, "Error: Cannot activate server <%s> using <%s>\n", server, startup.c_str ())); - ACE_THROW (ImplementationRepository::Administration::CannotActivate + ACE_THROW (ImplementationRepository::Administration::CannotActivate (CORBA::string_dup ("Process Creation Failed"))); ACE_CHECK; } @@ -350,8 +350,8 @@ ImplRepo_i::start_server_i (const char *server, // Kill the server this->process_mgr_.terminate (spawned_pid); - - ACE_THROW(ImplementationRepository::Administration::CannotActivate + + ACE_THROW(ImplementationRepository::Administration::CannotActivate (CORBA::string_dup ("Timeout"))); ACE_CHECK; } @@ -372,7 +372,7 @@ ImplRepo_i::start_server_i (const char *server, // Now check to see if it is responding yet: - ACE_Time_Value end = ACE_OS::gettimeofday () + ACE_Time_Value end = ACE_OS::gettimeofday () + OPTIONS::instance ()->startup_timeout (); ACE_TString server_object_ior, location; @@ -398,7 +398,7 @@ ImplRepo_i::start_server_i (const char *server, ACE_TRY_CHECK_EX (ping1); server_ping_object = - ImplementationRepository::ServerObject::_narrow (object.in (), + ImplementationRepository::ServerObject::_narrow (object.in (), ACE_TRY_ENV); ACE_TRY_CHECK_EX (ping1); @@ -420,12 +420,12 @@ ImplRepo_i::start_server_i (const char *server, // Kill the server this->process_mgr_.terminate (spawned_pid); - ACE_THROW (ImplementationRepository::Administration::CannotActivate + ACE_THROW (ImplementationRepository::Administration::CannotActivate (CORBA::string_dup ("Server Ping Object failed"))); } ACE_ENDTRY; ACE_CHECK; - + while (ACE_OS::gettimeofday () > end) { ACE_TRY_EX (ping2); @@ -445,8 +445,8 @@ ImplRepo_i::start_server_i (const char *server, // Kill the server this->process_mgr_.terminate (spawned_pid); - - ACE_THROW (ImplementationRepository::Administration::CannotActivate + + ACE_THROW (ImplementationRepository::Administration::CannotActivate (CORBA::string_dup ("Timeout"))); } @@ -462,8 +462,8 @@ ImplRepo_i::start_server_i (const char *server, // Kill the server this->process_mgr_.terminate (spawned_pid); - - ACE_THROW (ImplementationRepository::Administration::CannotActivate + + ACE_THROW (ImplementationRepository::Administration::CannotActivate (CORBA::string_dup ("Ping timed out"))); } ACE_ENDTRY; @@ -471,7 +471,7 @@ ImplRepo_i::start_server_i (const char *server, } } - + // Adds an entry to the Repository about this <server> @@ -734,7 +734,7 @@ ImplRepo_i::init (int argc, char **argv, CORBA::Environment &ACE_TRY_ENV) ACE_TRY_ENV); ACE_TRY_CHECK; - PortableServer::POAManager_var poa_manager = + PortableServer::POAManager_var poa_manager = this->root_poa_->the_POAManager (ACE_TRY_ENV); ACE_TRY_CHECK; @@ -758,7 +758,7 @@ ImplRepo_i::init (int argc, char **argv, CORBA::Environment &ACE_TRY_ENV) poa_manager.in (), policies, ACE_TRY_ENV); - + // Warning! If create_POA fails, then the policies won't be // destroyed and there will be hell to pay in memory leaks! ACE_TRY_CHECK; @@ -914,7 +914,7 @@ ImplRepo_i::init (int argc, char **argv, CORBA::Environment &ACE_TRY_ENV) ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Server_i::init"); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (-1); @@ -943,7 +943,7 @@ ImplRepo_i::fini (CORBA::Environment &ACE_TRY_ENV) ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Server_i::init"); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (-1); @@ -978,10 +978,10 @@ ImplRepo_i::run (CORBA::Environment &ACE_TRY_ENV) Server_Info::ActivationMode activation = Server_Info::NORMAL; ImplementationRepository::EnvironmentList environment_vars ; - server_entry->int_id_->get_startup_info (logical, - command_line, + server_entry->int_id_->get_startup_info (logical, + command_line, environment_vars, - working_directory, + working_directory, activation); ACE_TRY @@ -1129,10 +1129,10 @@ ImplRepo_i::list (CORBA::ULong how_many, Server_Info::ActivationMode activation = Server_Info::NORMAL; server_entry->int_id_->get_running_info (location, server_ior); - server_entry->int_id_->get_startup_info (logical, - command_line, + server_entry->int_id_->get_startup_info (logical, + command_line, environment_vars, - working_directory, + working_directory, activation); server_list[i].logical_server = CORBA::string_dup (logical.c_str ()); @@ -1170,7 +1170,7 @@ ImplRepo_i::list (CORBA::ULong how_many, } ACE_CATCHANY { - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -1238,7 +1238,7 @@ ImplRepo_i::shutdown_server (const char *server, } ACE_CATCHANY { - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; } @@ -1287,7 +1287,7 @@ IMR_Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent, parent->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID, ACE_TRY_ENV); ACE_TRY_CHECK; - PortableServer::POAManager_var poa_manager = + PortableServer::POAManager_var poa_manager = parent->the_POAManager (ACE_TRY_ENV); ACE_TRY_CHECK; @@ -1450,10 +1450,10 @@ IMR_Iterator::next_n (CORBA::ULong how_many, Server_Info::ActivationMode activation = Server_Info::NORMAL; server_entry->int_id_->get_running_info (location, server_ior); - server_entry->int_id_->get_startup_info (logical, - command_line, + server_entry->int_id_->get_startup_info (logical, + command_line, environment_vars, - working_directory, + working_directory, activation); server_list[i].logical_server = CORBA::string_dup (logical.c_str ()); diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp index 70bd70223bc..303e7e39d1d 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp @@ -1243,7 +1243,7 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a, } ACE_CATCHANY { - ACE_RETHROW; + ACE_RE_THROW_EX (producer_check); } ACE_ENDTRY; ACE_CHECK_RETURN (0); diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp index 45778012fd5..2fd79e01133 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp @@ -73,7 +73,7 @@ TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>:: } delete[] proxies; - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; } diff --git a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp index 03dbd8ad419..4938831be5a 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp @@ -85,7 +85,7 @@ TAO_Hash_Naming_Context::get_context (const CosNaming::Name &name, ex.rest_of_name.length (rest_len); ex.rest_of_name[rest_len - 1] = name[name_len - 1]; - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ()); @@ -508,7 +508,7 @@ TAO_Hash_Naming_Context::bind_new_context (const CosNaming::Name& n, ACE_DECLARE_NEW_CORBA_ENV; result->destroy (ACE_TRY_ENV); } - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ()); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.cpp index 0fa12aac4cd..8ca6c1f211b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.cpp @@ -98,7 +98,7 @@ TAO_Notify_Filter_i::add_constraints_i ( undo_info) != -1) delete undo_info; } - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -204,7 +204,7 @@ TAO_Notify_Filter_i::modify_constraints ( for (index = 0; index < modify_list.length (); ++index) constraint_expr_list_.bind (modify_list [index].constraint_id, constr_saved[index]); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.cpp index ae56a24801b..ca9f8f7b5f2 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.cpp @@ -96,7 +96,7 @@ TAO_Notify_ProxyPushSupplier_i::connect_any_push_consumer (CosEventComm::PushCon { this->cosec_push_consumer_ = CosNotifyComm::PushConsumer::_nil (); this->notify_push_consumer_ = CosNotifyComm::PushConsumer::_nil (); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.cpp index 718ae28836a..5fb74e80a36 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.cpp @@ -52,7 +52,7 @@ TAO_Notify_SequenceProxyPushSupplier_i::connect_sequence_push_consumer (CosNotif { this->push_consumer_ = CosNotifyComm::SequencePushConsumer::_nil (); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.cpp index 8e932acf6a7..a948d54e989 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.cpp @@ -52,7 +52,7 @@ TAO_Notify_StructuredProxyPushSupplier_i::connect_structured_push_consumer (CosN { this->push_consumer_ = CosNotifyComm::StructuredPushConsumer::_nil (); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; } diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp index d74c457d845..627c099c92c 100644 --- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp @@ -158,7 +158,7 @@ TAO_PropertySetFactory::create_constrained_propertyset (const CosPropertyService delete new_set; // Throw the exception. - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -202,7 +202,7 @@ TAO_PropertySetFactory::create_initial_propertyset (const CosPropertyService::Pr delete new_set; // Throw the exception. - ACE_RETHROW; + ACE_RE_THROW; } ACE_CATCH (CORBA::SystemException, ex) { @@ -210,7 +210,7 @@ TAO_PropertySetFactory::create_initial_propertyset (const CosPropertyService::Pr delete new_set; // Throw the exception. - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -303,7 +303,7 @@ TAO_PropertySetDefFactory::create_constrained_propertysetdef (const CosPropertyS delete new_set; // Throw the exception. - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -347,7 +347,7 @@ TAO_PropertySetDefFactory::create_initial_propertysetdef (const CosPropertyServi delete new_set; // Throw the exception. - ACE_RETHROW; + ACE_RE_THROW; } ACE_CATCH (CORBA::SystemException, ex) { @@ -355,7 +355,7 @@ TAO_PropertySetDefFactory::create_initial_propertysetdef (const CosPropertyServi delete new_set; // Throw the exception. - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -403,7 +403,7 @@ TAO_PropertySet::TAO_PropertySet (const CosPropertyService::PropertyTypes allowe ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_PropertySet-Constructor"); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -438,7 +438,7 @@ TAO_PropertySet::TAO_PropertySet (const CosPropertyService::Properties initial_p ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_PropertySet-Constructor"); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -668,7 +668,7 @@ TAO_PropertySet::define_properties (const CosPropertyService::Properties &nprope } ACE_CATCH (CORBA::SystemException, sysex) { - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -1066,7 +1066,7 @@ TAO_PropertySet::delete_properties (const CosPropertyService::PropertyNames &pro ACE_CATCH (CORBA::SystemException, sysex) { // We cant afford to get this. Throw this. - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -1174,7 +1174,7 @@ TAO_PropertySetDef::TAO_PropertySetDef (const CosPropertyService::PropertyTypes } ACE_CATCHANY { - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -1393,7 +1393,7 @@ TAO_PropertySetDef::define_properties_with_modes (const CosPropertyService::Prop } ACE_CATCH (CORBA::SystemException, sysex) { - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -1652,7 +1652,7 @@ TAO_PropertySetDef::set_property_modes (const CosPropertyService::PropertyModes } ACE_CATCH (CORBA::SystemException, systex) { - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Property_Exporter.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Property_Exporter.cpp index cc9601387f9..fc8d534cb22 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Property_Exporter.cpp +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Property_Exporter.cpp @@ -318,7 +318,7 @@ TAO_Property_Exporter::_cxx_export (const CORBA::Object_ptr object_ref, ACE_CATCHANY { // Sigh, all our efforts were for naight. - ACE_RETHROW; + ACE_RE_THROW; } */ ACE_ENDTRY; diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp index b92358822ca..cf44aa072cc 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp @@ -73,7 +73,7 @@ CC_Command::GetLockSet (const char *lock_set_name, } ACE_CATCHANY { - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp index 09f5a58fe39..b86af8c0a26 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp @@ -478,7 +478,7 @@ Test_Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV) } ACE_CATCHANY { - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; } diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp index 82f8597e356..79d0ee8a7aa 100644 --- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp +++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp @@ -787,7 +787,7 @@ Test_ECG::activate_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec, } ACE_CATCHANY { - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; } diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp index e9833077056..b52e47933f1 100644 --- a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp @@ -93,13 +93,13 @@ Airplane_Server_i::init (int argc, char** argv, CORBA::Environment &ACE_TRY_ENV) // Get the POA_Manager. this->poa_manager_ = root_poa->the_POAManager (ACE_TRY_ENV); ACE_TRY_CHECK; - + // We now need to create a POA with the persistent and user_id policies, // since they are need for use with the Implementation Repository. - + CORBA::PolicyList policies (2); policies.length (2); - + policies[0] = root_poa->create_id_assignment_policy (PortableServer::USER_ID, ACE_TRY_ENV); @@ -129,8 +129,8 @@ Airplane_Server_i::init (int argc, char** argv, CORBA::Environment &ACE_TRY_ENV) this->poa_manager_->activate (ACE_TRY_ENV); ACE_TRY_CHECK; - ACE_NEW_RETURN (this->server_impl_, - Airplane_i, + ACE_NEW_RETURN (this->server_impl_, + Airplane_i, -1); PortableServer::ObjectId_var server_id = @@ -168,7 +168,7 @@ Airplane_Server_i::init (int argc, char** argv, CORBA::Environment &ACE_TRY_ENV) ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Airplane_i::init"); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; @@ -188,7 +188,7 @@ Airplane_Server_i::run (CORBA::Environment &ACE_TRY_ENV) ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Airplane_Server_i::run"); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp index 240f3b22088..35c63baf9f2 100644 --- a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp @@ -90,7 +90,7 @@ Nestea_Server_i::init (int argc, char** argv, CORBA::Environment &ACE_TRY_ENV) // to use the SERVER_NAME as the POA's name. const char *poa_name = SERVER_NAME; - ACE_TRY + ACE_TRY { // Initialize the ORB this->orb_ = CORBA::ORB_init (argc, argv, 0, ACE_TRY_ENV); @@ -126,13 +126,13 @@ Nestea_Server_i::init (int argc, char** argv, CORBA::Environment &ACE_TRY_ENV) // Get the POA_Manager. this->poa_manager_ = root_poa->the_POAManager (ACE_TRY_ENV); ACE_TRY_CHECK; - + // We now need to create a POA with the persistent and user_id policies, // since they are need for use with the Implementation Repository. - + CORBA::PolicyList policies (2); policies.length (2); - + policies[0] = root_poa->create_id_assignment_policy (PortableServer::USER_ID, ACE_TRY_ENV); @@ -162,7 +162,7 @@ Nestea_Server_i::init (int argc, char** argv, CORBA::Environment &ACE_TRY_ENV) this->poa_manager_->activate (ACE_TRY_ENV); ACE_TRY_CHECK; - ACE_NEW_RETURN (this->server_impl_, + ACE_NEW_RETURN (this->server_impl_, Nestea_i (NESTEA_DATA_FILENAME), -1); @@ -202,10 +202,10 @@ Nestea_Server_i::init (int argc, char** argv, CORBA::Environment &ACE_TRY_ENV) ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Nestea_i::init"); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; - + ACE_CHECK_RETURN (-1); return 0; @@ -224,10 +224,10 @@ Nestea_Server_i::run (CORBA::Environment &ACE_TRY_ENV) ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Nestea_i::run"); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; - + ACE_CHECK_RETURN (-1); return status; diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.cpp b/TAO/orbsvcs/tests/Simple_Naming/client.cpp index 8372c99d524..d1a98211159 100644 --- a/TAO/orbsvcs/tests/Simple_Naming/client.cpp +++ b/TAO/orbsvcs/tests/Simple_Naming/client.cpp @@ -735,7 +735,7 @@ Exceptions_Test::invalid_name_test (TAO_Naming_Client &root_context, ACE_CATCHANY { ACE_DEBUG ((LM_DEBUG, "Invalid name test failed\n")); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -770,7 +770,7 @@ Exceptions_Test::already_bound_test (TAO_Naming_Client &root_context, ACE_CATCHANY { ACE_DEBUG ((LM_DEBUG, "Already bound (case 1) test failed\n")); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; @@ -807,7 +807,7 @@ Exceptions_Test::already_bound_test2 (TAO_Naming_Client &root_context, ACE_CATCHANY { ACE_DEBUG ((LM_DEBUG, "Already bound (case 2) test failed\n")); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -846,7 +846,7 @@ Exceptions_Test::not_found_test (TAO_Naming_Client &root_context, ACE_CATCHANY { ACE_DEBUG ((LM_DEBUG, "Not found test failed\n")); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -887,7 +887,7 @@ Exceptions_Test::not_found_test2 (TAO_Naming_Client &root_context, ACE_CATCHANY { ACE_DEBUG ((LM_DEBUG, "Unbind test failed\n")); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; @@ -928,7 +928,7 @@ Exceptions_Test::not_found_test3 (TAO_Naming_Client &root_context, ACE_CATCHANY { ACE_DEBUG ((LM_DEBUG, "Not found (case 3) test failed\n")); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; diff --git a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp index 19216d5a31d..df88b320c48 100644 --- a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp +++ b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp @@ -123,7 +123,7 @@ TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg, ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Offer_Exporter::export_offers"); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; // ACE_CHECK; @@ -235,7 +235,7 @@ TAO_Offer_Exporter::withdraw_offers (CORBA::Environment& ACE_TRY_ENV) ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Offer_Exporter::withdraw_offers"); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; } @@ -282,7 +282,7 @@ TAO_Offer_Exporter::describe_offers (CORBA::Environment& ACE_TRY_ENV) ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Offer_Exporter::describe_offers"); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; } @@ -336,7 +336,7 @@ TAO_Offer_Exporter::modify_offers (CORBA::Environment& ACE_TRY_ENV) ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Offer_Exporter::modify_offers"); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; } @@ -382,7 +382,7 @@ withdraw_offers_using_constraints (CORBA::Environment& ACE_TRY_ENV) { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Offer_Exporter::withdraw_using_constraint"); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; } @@ -447,7 +447,7 @@ TAO_Offer_Exporter::grab_offerids (CORBA::Environment& ACE_TRY_ENV) { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Offer_Exporter::grab_offerids"); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; // @@ redundant. diff --git a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp index 0ecf795a2e1..19b0126b753 100644 --- a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp +++ b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp @@ -220,7 +220,7 @@ perform_queries_with_policies (const TAO_Policy_Creator& policies, ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Offer_Importer::perform_queries"); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; } @@ -296,7 +296,7 @@ TAO_Offer_Importer::display_results (const CosTrading::OfferSeq& offer_seq, ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Offer_Importer::display_results"); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; } diff --git a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp index 1c95060e5c3..ba20cd0fc76 100644 --- a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp +++ b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp @@ -195,7 +195,7 @@ add_all_types_to (CosTradingRepos::ServiceTypeRepository_ptr repos, { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Service_Type_Exporter::add_all_types"); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -233,7 +233,7 @@ TAO_Service_Type_Exporter::list_all_types (CORBA::Environment& ACE_TRY_ENV) { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Service_Type_Exporter::list_all_types"); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; // ACE_CHECK; @@ -268,7 +268,7 @@ TAO_Service_Type_Exporter::describe_all_types (CORBA::Environment& ACE_TRY_ENV) { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Service_Type_Exporter::describe_all_types"); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; } @@ -302,7 +302,7 @@ TAO_Service_Type_Exporter::fully_describe_all_types (CORBA::Environment& ACE_TRY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Service_Type_Exporter::fully_describe_all_types"); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; } diff --git a/TAO/performance-tests/POA/Demux/demux_test_client.cpp b/TAO/performance-tests/POA/Demux/demux_test_client.cpp index c094cc192ba..76ebc264c62 100644 --- a/TAO/performance-tests/POA/Demux/demux_test_client.cpp +++ b/TAO/performance-tests/POA/Demux/demux_test_client.cpp @@ -61,7 +61,7 @@ Demux_Test_Client::init (int argc, char *argv [], { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "ORB_init"); - ACE_RETHROW; + ACE_RE_THROW_EX (GET_ORB); } ACE_ENDTRY; ACE_CHECK_RETURN (-1); @@ -123,7 +123,7 @@ Demux_Test_Client::init (int argc, char *argv [], { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "object_to_string"); - ACE_RETHROW; + ACE_RE_THROW_EX (IOR); } ACE_ENDTRY; ACE_CHECK_RETURN (-1); @@ -287,7 +287,7 @@ Demux_Test_Client::run (CORBA::Environment &ACE_TRY_ENV) ACE_ERROR ((LM_ERROR, "(%N:%l) Demux_Test_Client::run - " "Error running the Client\n")); - ACE_RETHROW; + ACE_RE_THROW_EX (RUN); } ACE_ENDTRY; ACE_CHECK_RETURN (-1); @@ -307,7 +307,7 @@ Demux_Test_Client::run (CORBA::Environment &ACE_TRY_ENV) ACE_ERROR ((LM_ERROR, "(%N:%l) Demux_Test_Client::run - " "Error running the Client\n")); - ACE_RETHROW; + ACE_RE_THROW_EX (SHUTDOWN) ; } ACE_ENDTRY; ACE_CHECK_RETURN (-1); diff --git a/TAO/performance-tests/POA/Demux/demux_test_server.cpp b/TAO/performance-tests/POA/Demux/demux_test_server.cpp index 98165a62e98..303ccb4fb73 100644 --- a/TAO/performance-tests/POA/Demux/demux_test_server.cpp +++ b/TAO/performance-tests/POA/Demux/demux_test_server.cpp @@ -63,7 +63,7 @@ Demux_Test_Server::init (int argc, char *argv [], ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "ORB_init"); - ACE_RETHROW; + ACE_RE_THROW_EX (GET_ORB); } ACE_ENDTRY; ACE_CHECK_RETURN (-1); @@ -93,7 +93,7 @@ Demux_Test_Server::init (int argc, char *argv [], { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "PortableServer::POA::_narrow"); - ACE_RETHROW; + ACE_RE_THROW_EX (GET_ROOT_POA); } ACE_ENDTRY; ACE_CHECK_RETURN (-1); @@ -110,7 +110,7 @@ Demux_Test_Server::init (int argc, char *argv [], { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "RootPOA->the_POAManager"); - ACE_RETHROW; + ACE_RE_THROW_EX (GET_POA_MGR); } ACE_ENDTRY; ACE_CHECK_RETURN (-1); @@ -187,7 +187,7 @@ Demux_Test_Server::init (int argc, char *argv [], { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "creating policy"); - ACE_RETHROW; + ACE_RE_THROW_EX (POLICY); } ACE_ENDTRY; ACE_CHECK_RETURN (-1); @@ -236,7 +236,7 @@ Demux_Test_Server::init (int argc, char *argv [], { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "create_POA"); - ACE_RETHROW; + ACE_RE_THROW_EX (CREATE_POA); } ACE_ENDTRY; ACE_CHECK_RETURN (-1); @@ -264,7 +264,7 @@ Demux_Test_Server::init (int argc, char *argv [], { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "poa->activate_obj"); - ACE_RETHROW; + ACE_RE_THROW_EX (ACTIVATE_OBJ); } ACE_ENDTRY; ACE_CHECK_RETURN (-1); @@ -287,7 +287,7 @@ Demux_Test_Server::init (int argc, char *argv [], { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "object_to_string"); - ACE_RETHROW; + ACE_RE_THROW_EX (IOR); } ACE_ENDTRY; ACE_CHECK_RETURN (-1); @@ -338,7 +338,7 @@ Demux_Test_Server::init (int argc, char *argv [], { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "object_to_string"); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (-1); @@ -366,7 +366,7 @@ Demux_Test_Server::init (int argc, char *argv [], { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "poa_mgr->activate"); - ACE_RETHROW; + ACE_RE_THROW_EX (ACTIVATE); } ACE_ENDTRY; ACE_CHECK_RETURN (-1); diff --git a/TAO/tao/ImplRepoC.cpp b/TAO/tao/ImplRepoC.cpp index 2c42fbaba87..0d70147678f 100644 --- a/TAO/tao/ImplRepoC.cpp +++ b/TAO/tao/ImplRepoC.cpp @@ -168,7 +168,7 @@ void ImplementationRepository::ServerObject::ping ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -279,7 +279,7 @@ void ImplementationRepository::ServerObject::shutdown ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -1384,7 +1384,7 @@ void ImplementationRepository::Administration::activate_server ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -1509,7 +1509,7 @@ void ImplementationRepository::Administration::register_server ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -1628,7 +1628,7 @@ void ImplementationRepository::Administration::reregister_server ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -1751,7 +1751,7 @@ void ImplementationRepository::Administration::remove_server ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -1874,7 +1874,7 @@ void ImplementationRepository::Administration::shutdown_server ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -2008,7 +2008,7 @@ char * ImplementationRepository::Administration::server_is_running ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -2131,7 +2131,7 @@ void ImplementationRepository::Administration::server_is_shutting_down ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -2260,7 +2260,7 @@ void ImplementationRepository::Administration::find ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -2385,7 +2385,7 @@ void ImplementationRepository::Administration::list ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -2844,7 +2844,7 @@ CORBA::Boolean ImplementationRepository::ServerInformationIterator::next_n ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (_tao_retval); @@ -2955,7 +2955,7 @@ void ImplementationRepository::ServerInformationIterator::destroy ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; diff --git a/TAO/tao/ImplRepoS.cpp b/TAO/tao/ImplRepoS.cpp index 2e391280df6..88037b37c0f 100644 --- a/TAO/tao/ImplRepoS.cpp +++ b/TAO/tao/ImplRepoS.cpp @@ -98,10 +98,10 @@ TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable::lookup (const ch static const class TAO_operation_db_entry wordlist[] = { {"",0},{"",0},{"",0},{"",0}, - {"ping", &POA_ImplementationRepository::ServerObject::ping_skel}, + {"ping", &POA_ImplementationRepository::ServerObject::ping_skel}, {"_is_a", &POA_ImplementationRepository::ServerObject::_is_a_skel}, {"",0},{"",0}, - {"shutdown", &POA_ImplementationRepository::ServerObject::shutdown_skel}, + {"shutdown", &POA_ImplementationRepository::ServerObject::shutdown_skel}, {"",0},{"",0},{"",0},{"",0}, {"_non_existent", &POA_ImplementationRepository::ServerObject::_non_existent_skel}, }; @@ -247,7 +247,7 @@ void POA_ImplementationRepository::ServerObject::ping_skel ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -326,7 +326,7 @@ void POA_ImplementationRepository::ServerObject::shutdown_skel ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -642,27 +642,27 @@ TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable::lookup (const static const class TAO_operation_db_entry wordlist[] = { {"",0},{"",0},{"",0},{"",0}, - {"list", &POA_ImplementationRepository::Administration::list_skel}, + {"list", &POA_ImplementationRepository::Administration::list_skel}, {"",0},{"",0},{"",0},{"",0}, - {"find", &POA_ImplementationRepository::Administration::find_skel}, + {"find", &POA_ImplementationRepository::Administration::find_skel}, {"",0},{"",0},{"",0}, - {"remove_server", &POA_ImplementationRepository::Administration::remove_server_skel}, + {"remove_server", &POA_ImplementationRepository::Administration::remove_server_skel}, {"",0}, - {"register_server", &POA_ImplementationRepository::Administration::register_server_skel}, + {"register_server", &POA_ImplementationRepository::Administration::register_server_skel}, {"",0}, - {"reregister_server", &POA_ImplementationRepository::Administration::reregister_server_skel}, + {"reregister_server", &POA_ImplementationRepository::Administration::reregister_server_skel}, {"",0},{"",0}, - {"shutdown_server", &POA_ImplementationRepository::Administration::shutdown_server_skel}, + {"shutdown_server", &POA_ImplementationRepository::Administration::shutdown_server_skel}, {"",0}, - {"server_is_running", &POA_ImplementationRepository::Administration::server_is_running_skel}, + {"server_is_running", &POA_ImplementationRepository::Administration::server_is_running_skel}, {"",0},{"",0}, - {"activate_server", &POA_ImplementationRepository::Administration::activate_server_skel}, + {"activate_server", &POA_ImplementationRepository::Administration::activate_server_skel}, {"",0},{"",0}, {"_non_existent", &POA_ImplementationRepository::Administration::_non_existent_skel}, {"",0}, {"_is_a", &POA_ImplementationRepository::Administration::_is_a_skel}, {"",0},{"",0}, - {"server_is_shutting_down", &POA_ImplementationRepository::Administration::server_is_shutting_down_skel}, + {"server_is_shutting_down", &POA_ImplementationRepository::Administration::server_is_shutting_down_skel}, }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) @@ -814,7 +814,7 @@ void POA_ImplementationRepository::Administration::activate_server_skel ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -904,7 +904,7 @@ void POA_ImplementationRepository::Administration::register_server_skel ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -994,7 +994,7 @@ void POA_ImplementationRepository::Administration::reregister_server_skel ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -1081,7 +1081,7 @@ void POA_ImplementationRepository::Administration::remove_server_skel ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -1168,7 +1168,7 @@ void POA_ImplementationRepository::Administration::shutdown_server_skel ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -1262,7 +1262,7 @@ void POA_ImplementationRepository::Administration::server_is_running_skel ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -1355,7 +1355,7 @@ void POA_ImplementationRepository::Administration::server_is_shutting_down_skel _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -1444,7 +1444,7 @@ void POA_ImplementationRepository::Administration::find_skel ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -1541,7 +1541,7 @@ void POA_ImplementationRepository::Administration::list_skel ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -2096,8 +2096,8 @@ TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable::loo { {"",0},{"",0},{"",0},{"",0},{"",0}, {"_is_a", &POA_ImplementationRepository::ServerInformationIterator::_is_a_skel}, - {"next_n", &POA_ImplementationRepository::ServerInformationIterator::next_n_skel}, - {"destroy", &POA_ImplementationRepository::ServerInformationIterator::destroy_skel}, + {"next_n", &POA_ImplementationRepository::ServerInformationIterator::next_n_skel}, + {"destroy", &POA_ImplementationRepository::ServerInformationIterator::destroy_skel}, {"",0},{"",0},{"",0},{"",0},{"",0}, {"_non_existent", &POA_ImplementationRepository::ServerInformationIterator::_non_existent_skel}, }; @@ -2254,7 +2254,7 @@ void POA_ImplementationRepository::ServerInformationIterator::next_n_skel ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -2340,7 +2340,7 @@ void POA_ImplementationRepository::ServerInformationIterator::destroy_skel ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; diff --git a/TAO/tao/InterfaceC.cpp b/TAO/tao/InterfaceC.cpp index 0c21176d71e..e83dd6cbce1 100644 --- a/TAO/tao/InterfaceC.cpp +++ b/TAO/tao/InterfaceC.cpp @@ -279,7 +279,7 @@ IR::DefinitionKind CORBA::IRObject::def_kind ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (_tao_retval); @@ -390,7 +390,7 @@ void CORBA::IRObject::destroy ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -728,7 +728,7 @@ char * IR_Contained::id ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -845,7 +845,7 @@ void IR_Contained::id ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -962,7 +962,7 @@ char * IR_Contained::name ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -1079,7 +1079,7 @@ void IR_Contained::name ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -1196,7 +1196,7 @@ char * IR_Contained::version ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -1313,7 +1313,7 @@ void IR_Contained::version ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -1431,7 +1431,7 @@ IR_Container_ptr IR_Contained::defined_in ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -1548,7 +1548,7 @@ char * IR_Contained::absolute_name ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -1666,7 +1666,7 @@ IR_Repository_ptr IR_Contained::containing_repository ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -1845,7 +1845,7 @@ IR_Contained::Description * IR_Contained::describe ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -1966,7 +1966,7 @@ void IR_Contained::move ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -4966,7 +4966,7 @@ IR_Contained_ptr IR_Container::lookup ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -5094,7 +5094,7 @@ IR_ContainedSeq * IR_Container::contents ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -5226,7 +5226,7 @@ IR_ContainedSeq * IR_Container::lookup_name ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -5593,7 +5593,7 @@ IR_Container::DescriptionSeq * IR_Container::describe_contents ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -5722,7 +5722,7 @@ IR_ModuleDef_ptr IR_Container::create_module ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -5855,7 +5855,7 @@ IR_ConstantDef_ptr IR_Container::create_constant ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -5986,7 +5986,7 @@ IR_StructDef_ptr IR_Container::create_struct ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -6119,7 +6119,7 @@ IR_UnionDef_ptr IR_Container::create_union ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -6250,7 +6250,7 @@ IR_EnumDef_ptr IR_Container::create_enum ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -6381,7 +6381,7 @@ IR_AliasDef_ptr IR_Container::create_alias ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -6515,7 +6515,7 @@ IR_InterfaceDef_ptr IR_Container::create_interface ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -6658,7 +6658,7 @@ IR_ValueDef_ptr IR_Container::create_value ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -6789,7 +6789,7 @@ IR_ValueBoxDef_ptr IR_Container::create_value_box ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -6920,7 +6920,7 @@ IR_ExceptionDef_ptr IR_Container::create_exception ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -7049,7 +7049,7 @@ IR_NativeDef_ptr IR_Container::create_native ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -7669,7 +7669,7 @@ CORBA::TypeCode_ptr IR_IDLType::type ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -8024,7 +8024,7 @@ IR_Contained_ptr IR_Repository::lookup_id ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -8149,7 +8149,7 @@ CORBA::TypeCode_ptr IR_Repository::get_canonical_typecode ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -8274,7 +8274,7 @@ IR_PrimitiveDef_ptr IR_Repository::get_primitive ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -8399,7 +8399,7 @@ IR_StringDef_ptr IR_Repository::create_string ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -8524,7 +8524,7 @@ IR_WstringDef_ptr IR_Repository::create_wstring ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -8651,7 +8651,7 @@ IR_SequenceDef_ptr IR_Repository::create_sequence ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -8778,7 +8778,7 @@ IR_ArrayDef_ptr IR_Repository::create_array ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -8905,7 +8905,7 @@ IR_FixedDef_ptr IR_Repository::create_fixed ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -9348,7 +9348,7 @@ IR_ComponentDef_ptr IR_ComponentRepository::create_component ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -9483,7 +9483,7 @@ IR_HomeDef_ptr IR_ComponentRepository::create_home ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -10091,7 +10091,7 @@ CORBA::TypeCode_ptr IR_ConstantDef::type ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -10209,7 +10209,7 @@ IR_IDLType_ptr IR_ConstantDef::type_def ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -10326,7 +10326,7 @@ void IR_ConstantDef::type_def ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -10445,7 +10445,7 @@ CORBA::Any * IR_ConstantDef::value ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -10562,7 +10562,7 @@ void IR_ConstantDef::value ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -11272,7 +11272,7 @@ IR_StructMemberSeq * IR_StructDef::members ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -11389,7 +11389,7 @@ void IR_StructDef::members ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -11722,7 +11722,7 @@ CORBA::TypeCode_ptr IR_UnionDef::discriminator_type ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -11840,7 +11840,7 @@ IR_IDLType_ptr IR_UnionDef::discriminator_type_def ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -11957,7 +11957,7 @@ void IR_UnionDef::discriminator_type_def ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -12076,7 +12076,7 @@ IR_UnionMemberSeq * IR_UnionDef::members ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -12193,7 +12193,7 @@ void IR_UnionDef::members ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -12568,7 +12568,7 @@ IR_EnumMemberSeq * IR_EnumDef::members ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -12685,7 +12685,7 @@ void IR_EnumDef::members ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -13017,7 +13017,7 @@ IR_IDLType_ptr IR_AliasDef::original_type_def ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -13134,7 +13134,7 @@ void IR_AliasDef::original_type_def ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -13651,7 +13651,7 @@ IR::PrimitiveKind IR_PrimitiveDef::kind ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (_tao_retval); @@ -13965,7 +13965,7 @@ CORBA::ULong IR_StringDef::bound ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (_tao_retval); @@ -14082,7 +14082,7 @@ void IR_StringDef::bound ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -14411,7 +14411,7 @@ CORBA::ULong IR_WstringDef::bound ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (_tao_retval); @@ -14528,7 +14528,7 @@ void IR_WstringDef::bound ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -14857,7 +14857,7 @@ CORBA::UShort IR_FixedDef::digits ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (_tao_retval); @@ -14974,7 +14974,7 @@ void IR_FixedDef::digits ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -15091,7 +15091,7 @@ CORBA::Short IR_FixedDef::scale ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (_tao_retval); @@ -15208,7 +15208,7 @@ void IR_FixedDef::scale ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -15565,7 +15565,7 @@ CORBA::ULong IR_SequenceDef::bound ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (_tao_retval); @@ -15682,7 +15682,7 @@ void IR_SequenceDef::bound ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -15800,7 +15800,7 @@ CORBA::TypeCode_ptr IR_SequenceDef::element_type ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -15918,7 +15918,7 @@ IR_IDLType_ptr IR_SequenceDef::element_type_def ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -16035,7 +16035,7 @@ void IR_SequenceDef::element_type_def ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -16405,7 +16405,7 @@ CORBA::ULong IR_ArrayDef::length ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (_tao_retval); @@ -16522,7 +16522,7 @@ void IR_ArrayDef::length ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -16640,7 +16640,7 @@ CORBA::TypeCode_ptr IR_ArrayDef::element_type ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -16758,7 +16758,7 @@ IR_IDLType_ptr IR_ArrayDef::element_type_def ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -16875,7 +16875,7 @@ void IR_ArrayDef::element_type_def ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -17246,7 +17246,7 @@ CORBA::TypeCode_ptr IR_ExceptionDef::type ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -17365,7 +17365,7 @@ IR_StructMemberSeq * IR_ExceptionDef::members ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -17482,7 +17482,7 @@ void IR_ExceptionDef::members ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -18243,7 +18243,7 @@ CORBA::TypeCode_ptr IR_AttributeDef::type ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -18361,7 +18361,7 @@ IR_IDLType_ptr IR_AttributeDef::type_def ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -18478,7 +18478,7 @@ void IR_AttributeDef::type_def ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -18595,7 +18595,7 @@ IR::AttributeMode IR_AttributeDef::mode ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (_tao_retval); @@ -18712,7 +18712,7 @@ void IR_AttributeDef::mode ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -19667,7 +19667,7 @@ CORBA::TypeCode_ptr IR_OperationDef::result ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -19785,7 +19785,7 @@ IR_IDLType_ptr IR_OperationDef::result_def ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -19902,7 +19902,7 @@ void IR_OperationDef::result_def ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -20021,7 +20021,7 @@ IR_ParDescriptionSeq * IR_OperationDef::params ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -20138,7 +20138,7 @@ void IR_OperationDef::params ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -20255,7 +20255,7 @@ IR::OperationMode IR_OperationDef::mode ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (_tao_retval); @@ -20372,7 +20372,7 @@ void IR_OperationDef::mode ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -20491,7 +20491,7 @@ IR_ContextIdSeq * IR_OperationDef::contexts ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -20608,7 +20608,7 @@ void IR_OperationDef::contexts ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -20727,7 +20727,7 @@ IR_ExceptionDefSeq * IR_OperationDef::exceptions ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -20844,7 +20844,7 @@ void IR_OperationDef::exceptions ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -22313,7 +22313,7 @@ IR_InterfaceDefSeq * IR_InterfaceDef::base_interfaces ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -22430,7 +22430,7 @@ void IR_InterfaceDef::base_interfaces ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -22547,7 +22547,7 @@ CORBA::Boolean IR_InterfaceDef::is_abstract ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (_tao_retval); @@ -22664,7 +22664,7 @@ void IR_InterfaceDef::is_abstract ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -22781,7 +22781,7 @@ CORBA::Boolean IR_InterfaceDef::is_local ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (_tao_retval); @@ -22898,7 +22898,7 @@ void IR_InterfaceDef::is_local ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -23022,7 +23022,7 @@ CORBA::Boolean IR_InterfaceDef::is_a ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (_tao_retval); @@ -23159,7 +23159,7 @@ IR_AttributeDef_ptr IR_InterfaceDef::create_attribute ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -23298,7 +23298,7 @@ IR_OperationDef_ptr IR_InterfaceDef::create_operation ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -24634,7 +24634,7 @@ CORBA::TypeCode_ptr IR_ValueMemberDef::type ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -24752,7 +24752,7 @@ IR_IDLType_ptr IR_ValueMemberDef::type_def ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -24869,7 +24869,7 @@ void IR_ValueMemberDef::type_def ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -24986,7 +24986,7 @@ CORBA::Visibility IR_ValueMemberDef::access ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (_tao_retval); @@ -25103,7 +25103,7 @@ void IR_ValueMemberDef::access ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -25475,7 +25475,7 @@ IR_InterfaceDefSeq * IR_ValueDef::supported_interfaces ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -25592,7 +25592,7 @@ void IR_ValueDef::supported_interfaces ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -25711,7 +25711,7 @@ IR_InitializerSeq * IR_ValueDef::initializers ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -25828,7 +25828,7 @@ void IR_ValueDef::initializers ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -25946,7 +25946,7 @@ IR_ValueDef_ptr IR_ValueDef::base_value ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -26063,7 +26063,7 @@ void IR_ValueDef::base_value ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -26182,7 +26182,7 @@ IR_ValueDefSeq * IR_ValueDef::abstract_base_values ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -26299,7 +26299,7 @@ void IR_ValueDef::abstract_base_values ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -26416,7 +26416,7 @@ CORBA::Boolean IR_ValueDef::is_abstract ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (_tao_retval); @@ -26533,7 +26533,7 @@ void IR_ValueDef::is_abstract ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -26650,7 +26650,7 @@ CORBA::Boolean IR_ValueDef::is_custom ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (_tao_retval); @@ -26767,7 +26767,7 @@ void IR_ValueDef::is_custom ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -26884,7 +26884,7 @@ CORBA::Boolean IR_ValueDef::is_truncatable ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (_tao_retval); @@ -27001,7 +27001,7 @@ void IR_ValueDef::is_truncatable ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -27125,7 +27125,7 @@ CORBA::Boolean IR_ValueDef::is_a ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (_tao_retval); @@ -27258,7 +27258,7 @@ IR_ValueMemberDef_ptr IR_ValueDef::create_value_member ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -27395,7 +27395,7 @@ IR_AttributeDef_ptr IR_ValueDef::create_attribute ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -27534,7 +27534,7 @@ IR_OperationDef_ptr IR_ValueDef::create_operation ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -28936,7 +28936,7 @@ IR_IDLType_ptr IR_ValueBoxDef::original_type_def ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -29053,7 +29053,7 @@ void IR_ValueBoxDef::original_type_def ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -29385,7 +29385,7 @@ IR_InterfaceDef_ptr IR_ProvidesDef::interface_type ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -29779,7 +29779,7 @@ IR_InterfaceDef_ptr IR_UsesDef::interface_type ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -29896,7 +29896,7 @@ CORBA::Boolean IR_UsesDef::is_multiple ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (_tao_retval); @@ -30675,7 +30675,7 @@ CORBA::Boolean IR_EventDef::is_a ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (_tao_retval); @@ -30793,7 +30793,7 @@ IR_ValueDef_ptr IR_EventDef::event ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -31758,7 +31758,7 @@ IR_InterfaceDefSeq * IR_ComponentDef::supported_interfaces ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -31875,7 +31875,7 @@ void IR_ComponentDef::supported_interfaces ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; @@ -31993,7 +31993,7 @@ IR_ComponentDef_ptr IR_ComponentDef::base_component ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -32112,7 +32112,7 @@ IR_ProvidesDefSeq * IR_ComponentDef::provides_interfaces ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -32231,7 +32231,7 @@ IR_UsesDefSeq * IR_ComponentDef::uses_interfaces ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -32350,7 +32350,7 @@ IR_EmitsDefSeq * IR_ComponentDef::emits_events ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -32469,7 +32469,7 @@ IR_PublishesDefSeq * IR_ComponentDef::publishes_events ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -32588,7 +32588,7 @@ IR_ConsumesDefSeq * IR_ComponentDef::consumes_events ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -32705,7 +32705,7 @@ CORBA::Boolean IR_ComponentDef::is_basic ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (_tao_retval); @@ -32836,7 +32836,7 @@ IR_ProvidesDef_ptr IR_ComponentDef::create_provides ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -32969,7 +32969,7 @@ IR_UsesDef_ptr IR_ComponentDef::create_uses ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -33100,7 +33100,7 @@ IR_EmitsDef_ptr IR_ComponentDef::create_emits ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -33231,7 +33231,7 @@ IR_PublishesDef_ptr IR_ComponentDef::create_publishes ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -33362,7 +33362,7 @@ IR_ConsumesDef_ptr IR_ComponentDef::create_consumes ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -34343,7 +34343,7 @@ CORBA::Boolean IR_PrimaryKeyDef::is_a ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (_tao_retval); @@ -34461,7 +34461,7 @@ IR_ValueDef_ptr IR_PrimaryKeyDef::primary_key ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -35240,7 +35240,7 @@ IR_HomeDef_ptr IR_HomeDef::base_home ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -35358,7 +35358,7 @@ IR_ComponentDef_ptr IR_HomeDef::managed_component ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -35476,7 +35476,7 @@ IR_PrimaryKeyDef_ptr IR_HomeDef::primary_key ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -35595,7 +35595,7 @@ IR_FactoryDefSeq * IR_HomeDef::factories ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -35714,7 +35714,7 @@ IR_FinderDefSeq * IR_HomeDef::finders ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -35831,7 +35831,7 @@ CORBA::Boolean IR_HomeDef::is_basic ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (_tao_retval); @@ -35962,7 +35962,7 @@ IR_PrimaryKeyDef_ptr IR_HomeDef::create_primary_key ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -36095,7 +36095,7 @@ IR_FactoryDef_ptr IR_HomeDef::create_factory ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -36228,7 +36228,7 @@ IR_FinderDef_ptr IR_HomeDef::create_finder ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -37324,7 +37324,7 @@ CORBA::TypeCode_ptr CORBA::TypeCodeFactory::create_struct_tc ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -37455,7 +37455,7 @@ CORBA::TypeCode_ptr CORBA::TypeCodeFactory::create_union_tc ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -37584,7 +37584,7 @@ CORBA::TypeCode_ptr CORBA::TypeCodeFactory::create_enum_tc ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -37713,7 +37713,7 @@ CORBA::TypeCode_ptr CORBA::TypeCodeFactory::create_alias_tc ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -37842,7 +37842,7 @@ CORBA::TypeCode_ptr CORBA::TypeCodeFactory::create_exception_tc ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -37969,7 +37969,7 @@ CORBA::TypeCode_ptr CORBA::TypeCodeFactory::create_interface_tc ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -38094,7 +38094,7 @@ CORBA::TypeCode_ptr CORBA::TypeCodeFactory::create_string_tc ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -38219,7 +38219,7 @@ CORBA::TypeCode_ptr CORBA::TypeCodeFactory::create_wstring_tc ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -38346,7 +38346,7 @@ CORBA::TypeCode_ptr CORBA::TypeCodeFactory::create_fixed_tc ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -38473,7 +38473,7 @@ CORBA::TypeCode_ptr CORBA::TypeCodeFactory::create_sequence_tc ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -38600,7 +38600,7 @@ CORBA::TypeCode_ptr CORBA::TypeCodeFactory::create_array_tc ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -38733,7 +38733,7 @@ CORBA::TypeCode_ptr CORBA::TypeCodeFactory::create_value_tc ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -38862,7 +38862,7 @@ CORBA::TypeCode_ptr CORBA::TypeCodeFactory::create_value_box_tc ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -38989,7 +38989,7 @@ CORBA::TypeCode_ptr CORBA::TypeCodeFactory::create_native_tc ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -39114,7 +39114,7 @@ CORBA::TypeCode_ptr CORBA::TypeCodeFactory::create_recursive_tc ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -39241,7 +39241,7 @@ CORBA::TypeCode_ptr CORBA::TypeCodeFactory::create_abstract_interface_tc ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -39368,7 +39368,7 @@ CORBA::TypeCode_ptr CORBA::TypeCodeFactory::create_component_tc ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -39495,7 +39495,7 @@ CORBA::TypeCode_ptr CORBA::TypeCodeFactory::create_home_tc ( _tao_cookies, ACE_TRY_ENV ); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK_RETURN (0); diff --git a/TAO/tao/Invocation.cpp b/TAO/tao/Invocation.cpp index d535b9da333..cf705eb1aa6 100644 --- a/TAO/tao/Invocation.cpp +++ b/TAO/tao/Invocation.cpp @@ -664,7 +664,7 @@ TAO_GIOP_Twoway_Invocation::invoke (CORBA::ExceptionList_ptr exceptions, // this is a client side problem, for one particular // request. // this->transport_->close_connection (); - // ACE_RETHROW; + // ACE_RE_THROW; const ACE_Message_Block* cdr = this->inp_stream ().start (); diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index eebb6d17294..3d2171cd1b7 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -1694,7 +1694,7 @@ CORBA_ORB::file_string_to_object (const char* filename, ACE_CATCHANY { reader.alloc ()->free (string); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp index 8f91ebe25aa..caba2a873e8 100644 --- a/TAO/tao/Object.cpp +++ b/TAO/tao/Object.cpp @@ -389,7 +389,7 @@ CORBA_Object::_non_existent (CORBA::Environment &ACE_TRY_ENV) } ACE_CATCHANY { - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; return _tao_retval; diff --git a/TAO/tests/MProfile/client.cpp b/TAO/tests/MProfile/client.cpp index 13132638128..5c29f9b04cf 100644 --- a/TAO/tests/MProfile/client.cpp +++ b/TAO/tests/MProfile/client.cpp @@ -82,11 +82,11 @@ main (int argc, char *argv[]) 0, ACE_TRY_ENV); ACE_TRY_CHECK; - + TAO_IOP::TAO_IOR_Manipulation_ptr iorm = TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM, ACE_TRY_ENV); ACE_TRY_CHECK; - + TAO_IOP::TAO_IOR_Manipulation::IORList iors (2); iors.length(2); iors [0] = object_primary; @@ -94,12 +94,12 @@ main (int argc, char *argv[]) CORBA_Object_var merged = iorm->merge_iors (iors, ACE_TRY_ENV); ACE_TRY_CHECK; - + // Combined IOR stuff Simple_Server_var server = Simple_Server::_narrow (merged.in (), ACE_TRY_ENV); ACE_TRY_CHECK; - + if (CORBA::is_nil (server.in ())) { ACE_ERROR_RETURN ((LM_ERROR, @@ -129,7 +129,7 @@ void run_test (Simple_Server_ptr server, // Make a remote call server->remote_call (ACE_TRY_ENV); ACE_TRY_CHECK; - + /*ACE_DEBUG ((LM_DEBUG, "Kill the primary . . . ")); ACE_OS::sleep (25); @@ -137,7 +137,7 @@ void run_test (Simple_Server_ptr server, ACE_DEBUG ((LM_DEBUG, "I am going to shutdown \n")); server->shutdown (ACE_TRY_ENV); - ACE_TRY_CHECK; + ACE_TRY_CHECK; ACE_OS::sleep (25); } ACE_CATCH (CORBA::TRANSIENT, t) @@ -165,7 +165,7 @@ void run_test (Simple_Server_ptr server, { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception"); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; diff --git a/TAO/tests/MProfile_Forwarding/client.cpp b/TAO/tests/MProfile_Forwarding/client.cpp index 2f7a9427068..e42206973c9 100644 --- a/TAO/tests/MProfile_Forwarding/client.cpp +++ b/TAO/tests/MProfile_Forwarding/client.cpp @@ -18,13 +18,13 @@ parse_args (int argc, char *argv[]) switch (c) { case 'o': - ior_input_file = get_opts.optarg; - break; + ior_input_file = get_opts.optarg; + break; case '?': default: ACE_ERROR_RETURN ((LM_ERROR, "usage: %s " - "-o <iorfile>" + "-o <iorfile>" "\n", argv [0]), -1); @@ -51,7 +51,7 @@ main (int argc, char *argv[]) if (parse_args (argc, argv) == -1) return -1; - CORBA::Object_var objref = + CORBA::Object_var objref = orb->string_to_object (ior_input_file); ACE_TRY_CHECK; @@ -61,11 +61,11 @@ main (int argc, char *argv[]) "The received objref is NULL \n"), -1); } - - Simple_Server_var server = + + Simple_Server_var server = Simple_Server::_narrow (objref.in (), ACE_TRY_ENV); ACE_TRY_CHECK; - + if (CORBA::is_nil (server.in ())) { ACE_ERROR_RETURN ((LM_ERROR, @@ -98,7 +98,7 @@ void run_test (Simple_Server_ptr server, // Make a remote call server->remote_call (ACE_TRY_ENV); ACE_TRY_CHECK; - + /*ACE_DEBUG ((LM_DEBUG, "Kill the primary . . . ")); ACE_OS::sleep (25); @@ -106,7 +106,7 @@ void run_test (Simple_Server_ptr server, ACE_DEBUG ((LM_DEBUG, "I am going to shutdown \n")); server->shutdown (ACE_TRY_ENV); - ACE_TRY_CHECK; + ACE_TRY_CHECK; ACE_OS::sleep (23); } ACE_CATCH (CORBA::UserException, x) @@ -127,7 +127,7 @@ void run_test (Simple_Server_ptr server, { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception"); - ACE_RETHROW; + ACE_RE_THROW; } ACE_ENDTRY; ACE_CHECK; |