diff options
author | okellogg <okellogg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-01-29 20:21:11 +0000 |
---|---|---|
committer | okellogg <okellogg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-01-29 20:21:11 +0000 |
commit | 56681ffa90714cf82c32e907c0f80cea75166740 (patch) | |
tree | fd798ba5478a08b4b6f842cb8515ed9776861f5f /TAO/tests/Portable_Interceptors/IORInterceptor | |
parent | 6b5e98c78a7f66029147fad41e2e75cea35854aa (diff) | |
download | ATCD-56681ffa90714cf82c32e907c0f80cea75166740.tar.gz |
ChangeLogTag:Tue Jan 29 21:09:12 2002 Oliver Kellogg <oliver.kellogg@sysde.eads.net>
Diffstat (limited to 'TAO/tests/Portable_Interceptors/IORInterceptor')
12 files changed, 59 insertions, 59 deletions
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp index 2adf3bbcd2e..100d5176c81 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp @@ -9,14 +9,14 @@ ACE_RCSID (IORInterceptor, char * FOO_ClientRequestInterceptor::name ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("FOO_ClientRequestInterceptor"); } void -FOO_ClientRequestInterceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +FOO_ClientRequestInterceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -24,7 +24,7 @@ FOO_ClientRequestInterceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void FOO_ClientRequestInterceptor::send_request ( PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -33,7 +33,7 @@ FOO_ClientRequestInterceptor::send_request ( // profile. IOP::TaggedComponent_var component = ri->get_effective_component (FOO::COMPONENT_ID - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // The correct tagged component appears to exist. Display the @@ -61,7 +61,7 @@ FOO_ClientRequestInterceptor::send_request ( void FOO_ClientRequestInterceptor::send_poll ( PortableInterceptor::ClientRequestInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -69,7 +69,7 @@ FOO_ClientRequestInterceptor::send_poll ( void FOO_ClientRequestInterceptor::receive_reply ( PortableInterceptor::ClientRequestInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -77,7 +77,7 @@ FOO_ClientRequestInterceptor::receive_reply ( void FOO_ClientRequestInterceptor::receive_exception ( PortableInterceptor::ClientRequestInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -86,7 +86,7 @@ FOO_ClientRequestInterceptor::receive_exception ( void FOO_ClientRequestInterceptor::receive_other ( PortableInterceptor::ClientRequestInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h index 6dd2180d9de..02c4319ddcb 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h @@ -58,37 +58,37 @@ public: */ //@{ /// Return the name of this ClientRequestInterceptor. - virtual char * name (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_request ( PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void send_poll ( PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_reply ( PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_exception ( PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void receive_other ( PortableInterceptor::ClientRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); //@} diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp index 1986211dd64..2ca470b3152 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp @@ -10,7 +10,7 @@ ACE_RCSID (IORInterceptor, void FOO_Client_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr /* info */ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -18,7 +18,7 @@ FOO_Client_ORBInitializer::pre_init ( void FOO_Client_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableInterceptor::ClientRequestInterceptor_ptr foo; @@ -35,6 +35,6 @@ FOO_Client_ORBInitializer::post_init ( foo; info->add_client_request_interceptor (interceptor.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.h index afec7a1b51e..01a5cc2bce6 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.h @@ -57,13 +57,13 @@ public: /// The pre-initialization hook. virtual void pre_init ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// The post-initialization hook. virtual void post_init ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); //@} diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp index 95a8d090193..e5b12846c51 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp @@ -8,14 +8,14 @@ ACE_RCSID (IORInterceptor, "$Id$") char * -FOO_IORInterceptor::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +FOO_IORInterceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("FOO_IORInterceptor"); } void -FOO_IORInterceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +FOO_IORInterceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -23,7 +23,7 @@ FOO_IORInterceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void FOO_IORInterceptor::establish_components ( PortableInterceptor::IORInfo_ptr info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // According to the Portable Interceptors specification, @@ -32,7 +32,7 @@ FOO_IORInterceptor::establish_components ( // does the right thing, and ignores any IOR interceptors that throw // an exception. - CORBA::String_var name = this->name (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var name = this->name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Get the length of the string plus one for the NULL terminator. @@ -53,7 +53,7 @@ FOO_IORInterceptor::establish_components ( // Add the tagged component to all profiles. info->add_ior_component (FOO_Component - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -65,7 +65,7 @@ FOO_IORInterceptor::establish_components ( void FOO_IORInterceptor::components_established ( PortableInterceptor::IORInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return; @@ -75,7 +75,7 @@ void FOO_IORInterceptor::adapter_manager_state_changed ( PortableInterceptor::AdapterManagerId , PortableInterceptor::AdapterState - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return; @@ -85,7 +85,7 @@ void FOO_IORInterceptor:: adapter_state_changed ( const PortableInterceptor::ObjectReferenceTemplateSeq &, PortableInterceptor::AdapterState - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return; diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h index df51ed69ddb..2fa2027a6fc 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h @@ -56,28 +56,28 @@ public: */ //@{ /// Return the name of this IORInterceptor. - virtual char * name (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Cleanup resources acquired by this IORInterceptor. - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Add the tagged components to the IOR. virtual void establish_components ( PortableInterceptor::IORInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void components_established ( PortableInterceptor::IORInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void adapter_manager_state_changed ( PortableInterceptor::AdapterManagerId id, PortableInterceptor::AdapterState state - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); @@ -85,7 +85,7 @@ public: virtual void adapter_state_changed ( const PortableInterceptor::ObjectReferenceTemplateSeq & templates, PortableInterceptor::AdapterState state - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp index 3781f73dd95..1860310c092 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp @@ -10,7 +10,7 @@ ACE_RCSID (IORInterceptor, void FOO_IORInterceptor_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr /* info */ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -18,7 +18,7 @@ FOO_IORInterceptor_ORBInitializer::pre_init ( void FOO_IORInterceptor_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -36,6 +36,6 @@ FOO_IORInterceptor_ORBInitializer::post_init ( foo; info->add_ior_interceptor (ior_interceptor.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.h index 7b1dc666c0f..ed0a8ce161f 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.h @@ -57,13 +57,13 @@ public: /// The pre-initialization hook. virtual void pre_init ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// The post-initialization hook. virtual void post_init ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); //@} diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp index f0177e0af19..b0869bed3f1 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp @@ -37,7 +37,7 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { #if TAO_HAS_INTERCEPTORS == 1 @@ -51,23 +51,23 @@ main (int argc, char *argv[]) temp_initializer; PortableInterceptor::register_orb_initializer (orb_initializer.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS == 1 */ CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "client_orb" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "client_orb" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var obj = - orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; FOO::test_var server = - FOO::test::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + FOO::test::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) @@ -78,7 +78,7 @@ main (int argc, char *argv[]) 1); } - server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp index e981076e18b..4d9e10f5536 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp @@ -39,7 +39,7 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { #if TAO_HAS_INTERCEPTORS == 1 @@ -53,7 +53,7 @@ main (int argc, char *argv[]) temp_initializer; PortableInterceptor::register_orb_initializer (orb_initializer.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS == 1 */ @@ -61,16 +61,16 @@ main (int argc, char *argv[]) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "test_orb" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) @@ -79,10 +79,10 @@ main (int argc, char *argv[]) -1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -90,11 +90,11 @@ main (int argc, char *argv[]) test_i server_impl (orb.in ()); - obj = server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + obj = server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; FOO::test_var server = FOO::test::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) @@ -104,7 +104,7 @@ main (int argc, char *argv[]) -1); CORBA::String_var ior = - orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_INFO, "FOO::test: <%s>\n", ior.in ())); @@ -123,7 +123,7 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_INFO, "Event loop finished.\n")); diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp index 1bcd569d623..ecdb6b3560f 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp @@ -12,10 +12,10 @@ test_i::test_i (CORBA::ORB_ptr orb) } void -test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "\"test_i\" is shutting down.\n")); - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.h b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.h index 2309de5d64b..a712ff5c8d7 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.h +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.h @@ -34,7 +34,7 @@ public: test_i (CORBA::ORB_ptr orb); /// Shutdown the ORB. - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); private: |