diff options
Diffstat (limited to 'TAO/orbsvcs/tests/Interoperable_Naming')
3 files changed, 3 insertions, 7 deletions
diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp b/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp index a7b13988c33..b86d36f0440 100644 --- a/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp +++ b/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp @@ -33,8 +33,7 @@ int main (int argc, char *argv []) if (client.init (argc, argv) != 0) return 1; - result = client.run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + result = client.run (); } ACE_CATCHANY { diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp index 2f6f2d7ad72..8d88b5cca1e 100644 --- a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp +++ b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp @@ -148,7 +148,7 @@ NContextExt_Client_i::get_name () } int -NContextExt_Client_i::run (ACE_ENV_SINGLE_ARG_DECL) +NContextExt_Client_i::run (void) { ACE_TRY_EX (OuterBlock) @@ -256,7 +256,6 @@ NContextExt_Client_i::run (ACE_ENV_SINGLE_ARG_DECL) return -1; } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); return 0; } @@ -286,7 +285,6 @@ NContextExt_Client_i::init (int argc, char **argv) // Get a reference to the Naming Service CORBA::Object_var naming_context_object = orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (naming_context_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -297,7 +295,6 @@ NContextExt_Client_i::init (int argc, char **argv) this->naming_context_ = CosNaming::NamingContextExt::_narrow (naming_context_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (this->naming_context_.in ())) ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h index 930aeaf426a..422a144f817 100644 --- a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h +++ b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h @@ -39,7 +39,7 @@ class NContextExt_Client_i NContextExt_Client_i (void); ~NContextExt_Client_i (void); - int run (ACE_ENV_SINGLE_ARG_DECL); + int run (void); // Execute the client example code. int init (int argc, char **argv); |