diff options
Diffstat (limited to 'TAO/tests/Smart_Proxies/Policy/server.cpp')
| -rw-r--r-- | TAO/tests/Smart_Proxies/Policy/server.cpp | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/TAO/tests/Smart_Proxies/Policy/server.cpp b/TAO/tests/Smart_Proxies/Policy/server.cpp index 7e000c323d3..027b6855313 100644 --- a/TAO/tests/Smart_Proxies/Policy/server.cpp +++ b/TAO/tests/Smart_Proxies/Policy/server.cpp @@ -34,7 +34,7 @@ public: ACE_THROW_SPEC ((CORBA::SystemException, Test::Oops)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -63,7 +63,7 @@ Test_i :: method (CORBA::Short boo } void -Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Test_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); @@ -110,34 +110,28 @@ main (int argc, char *argv[]) argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test_i servant (orb.in ()); // Obtain RootPOA. CORBA::Object_var object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); Test_var Test_object = - servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + servant._this (); CORBA::String_var ior = orb->object_to_string (Test_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) @@ -157,11 +151,9 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); @@ -169,7 +161,6 @@ main (int argc, char *argv[]) root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { |