diff options
Diffstat (limited to 'TAO/tests/MT_Client/client.cpp')
| -rw-r--r-- | TAO/tests/MT_Client/client.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/TAO/tests/MT_Client/client.cpp b/TAO/tests/MT_Client/client.cpp index 61a155fc737..aaab6575632 100644 --- a/TAO/tests/MT_Client/client.cpp +++ b/TAO/tests/MT_Client/client.cpp @@ -64,7 +64,7 @@ public: // The thread entry point. private: - void validate_connection (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + void validate_connection (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); // Validate the connection private: @@ -81,18 +81,18 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = - orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Simple_Server_var server = - Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) @@ -116,11 +116,11 @@ main (int argc, char *argv[]) if (server_shutdown) { - server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -144,7 +144,7 @@ Client::Client (Simple_Server_ptr server, } void -Client::validate_connection (TAO_ENV_SINGLE_ARG_DECL) +Client::validate_connection (ACE_ENV_SINGLE_ARG_DECL) { // Ping the object 100 times, ignoring all exceptions. // It would be better to use validate_connection() but the test must @@ -153,7 +153,7 @@ Client::validate_connection (TAO_ENV_SINGLE_ARG_DECL) { ACE_TRY { - this->server_->test_method (TAO_ENV_SINGLE_ARG_PARAMETER); + this->server_->test_method (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY {} ACE_ENDTRY; @@ -165,12 +165,12 @@ Client::svc (void) { ACE_TRY_NEW_ENV { - this->validate_connection (TAO_ENV_SINGLE_ARG_PARAMETER); + this->validate_connection (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; for (int i = 0; i < this->niterations_; ++i) { - this->server_->test_method (TAO_ENV_SINGLE_ARG_PARAMETER); + this->server_->test_method (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (TAO_debug_level > 0 && i % 100 == 0) |