diff options
Diffstat (limited to 'TAO/orbsvcs/tests/Miop/McastHello')
| -rw-r--r-- | TAO/orbsvcs/tests/Miop/McastHello/McastHello.cpp | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Miop/McastHello/McastHello.h | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Miop/McastHello/client.cpp | 10 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Miop/McastHello/server.cpp | 19 |
4 files changed, 8 insertions, 25 deletions
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.cpp b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.cpp index c9b304c57bd..18ef2957365 100644 --- a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.cpp +++ b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.cpp @@ -55,7 +55,7 @@ McastHello::send_large_octet_array (const Test::Octets &payload ACE_ENV_ARG_DECL } void -McastHello::shutdown (ACE_ENV_SINGLE_ARG_DECL) +McastHello::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); diff --git a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.h b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.h index d0135f3ae55..f1ed7f37cb7 100644 --- a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.h +++ b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.h @@ -21,7 +21,7 @@ public: virtual void send_forty_two (CORBA::Long forty_two ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return whether all test requests have been received successfully. diff --git a/TAO/orbsvcs/tests/Miop/McastHello/client.cpp b/TAO/orbsvcs/tests/Miop/McastHello/client.cpp index 10180538dbf..ffcb507da30 100644 --- a/TAO/orbsvcs/tests/Miop/McastHello/client.cpp +++ b/TAO/orbsvcs/tests/Miop/McastHello/client.cpp @@ -44,14 +44,12 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; /* Do an unchecked narrow since there's no way to do an is_a on @@ -72,7 +70,6 @@ main (int argc, char *argv[]) } hello->send_forty_two (42 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Octets payload (MAX_MIOP_OCTET_SEQUENCE); payload.length (MAX_MIOP_OCTET_SEQUENCE); @@ -83,13 +80,10 @@ main (int argc, char *argv[]) } hello->send_large_octet_array (payload ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello->shutdown (); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/orbsvcs/tests/Miop/McastHello/server.cpp b/TAO/orbsvcs/tests/Miop/McastHello/server.cpp index ecf06638ce2..29b8d804f0b 100644 --- a/TAO/orbsvcs/tests/Miop/McastHello/server.cpp +++ b/TAO/orbsvcs/tests/Miop/McastHello/server.cpp @@ -56,15 +56,12 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableGroup::GOA_var root_poa = PortableGroup::GOA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -72,8 +69,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -84,7 +80,6 @@ main (int argc, char *argv[]) CORBA::Object_var group1 = orb->string_to_object (ior.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Output the Group IOR to the <ior_output_file> FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -99,7 +94,6 @@ main (int argc, char *argv[]) PortableServer::ObjectId_var id = root_poa->create_id_for_reference (group1.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Create and activate an instance of our servant. McastHello server_impl (orb.in (), 0); @@ -107,22 +101,17 @@ main (int argc, char *argv[]) root_poa->activate_object_with_id (id.in (), &server_impl ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - 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, "(%P|%t) server - event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); // Validate that our servants got the right requests. if (server_impl.get_status () == 0) |