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/Smart_Proxies/On_Demand/server.cpp | |
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/Smart_Proxies/On_Demand/server.cpp')
-rw-r--r-- | TAO/tests/Smart_Proxies/On_Demand/server.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/TAO/tests/Smart_Proxies/On_Demand/server.cpp b/TAO/tests/Smart_Proxies/On_Demand/server.cpp index aa8145b53ec..99d8cce8908 100644 --- a/TAO/tests/Smart_Proxies/On_Demand/server.cpp +++ b/TAO/tests/Smart_Proxies/On_Demand/server.cpp @@ -29,11 +29,11 @@ public: Test_i (CORBA::ORB_ptr orb); CORBA::Short method (CORBA::Short boo - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Test::Oops)); - void shutdown (TAO_ENV_SINGLE_ARG_DECL) + void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -48,7 +48,7 @@ Test_i::Test_i (CORBA::ORB_ptr orb) CORBA::Short Test_i :: method (CORBA::Short boo - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Test::Oops)) { @@ -62,7 +62,7 @@ Test_i :: method (CORBA::Short boo } void -Test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (); @@ -98,7 +98,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 { @@ -108,33 +108,33 @@ main (int argc, char *argv[]) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test_i servant (orb.in ()); // Obtain RootPOA. CORBA::Object_var object = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); PortableServer::POA_var root_poa = PortableServer::POA::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POAManager of the RootPOA. 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; Test_var Test_object = - servant._this (TAO_ENV_SINGLE_ARG_PARAMETER); + servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = orb->object_to_string (Test_object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) @@ -154,17 +154,17 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); root_poa->destroy (1, 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY |