diff options
Diffstat (limited to 'TAO/examples/PluggableUDP/tests/SimplePerformance')
4 files changed, 30 insertions, 30 deletions
diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp b/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp index 7358ff679cb..8ac9cf12210 100644 --- a/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp +++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp @@ -69,15 +69,15 @@ int main (int argc, char *argv[]) CORBA::ORB_init (argc, argv, "ORB_Test_Client" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object = - orb->string_to_object (iorFile TAO_ENV_ARG_PARAMETER); + orb->string_to_object (iorFile 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 ())) @@ -90,7 +90,7 @@ int main (int argc, char *argv[]) CORBA::String_var string = orb->object_to_string (server.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -103,7 +103,7 @@ int main (int argc, char *argv[]) //ACE_DEBUG ((LM_DEBUG, "threads finished\n")); - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -143,7 +143,7 @@ Client::svc (void) // This sets up the connector, so that we do not incur // the overhead on the first call in the loop. - server_->sendCharSeq (charSeq TAO_ENV_ARG_PARAMETER); + server_->sendCharSeq (charSeq ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; timer.start (); @@ -153,10 +153,10 @@ Client::svc (void) { client_count++; - server_->sendCharSeq (charSeq TAO_ENV_ARG_PARAMETER); + server_->sendCharSeq (charSeq ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - //server_->sendOctetSeq (octetSeq TAO_ENV_ARG_PARAMETER); + //server_->sendOctetSeq (octetSeq ACE_ENV_ARG_PARAMETER); //ACE_DEBUG ((LM_DEBUG, ".")); } @@ -177,7 +177,7 @@ Client::svc (void) dur / this->niterations_, 1000000 / (dur / this->niterations_))); - server_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + server_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp b/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp index d8931bf0556..5c6e538d760 100644 --- a/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp +++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp @@ -39,11 +39,11 @@ int main (int argc, char *argv[]) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "ORB_Test_Server" TAO_ENV_ARG_PARAMETER); + "ORB_Test_Server" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -52,26 +52,26 @@ int main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; 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; Simple_Server_i server_impl (orb.in ()); - PortableServer::ObjectId_var oidServer = root_poa->activate_object (&server_impl TAO_ENV_ARG_PARAMETER); + PortableServer::ObjectId_var oidServer = root_poa->activate_object (&server_impl ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::Object_var objOne = root_poa->id_to_reference (oidServer.in () TAO_ENV_ARG_PARAMETER); + CORBA::Object_var objOne = root_poa->id_to_reference (oidServer.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - Simple_Server_var server = Simple_Server::_narrow (objOne.in () TAO_ENV_ARG_PARAMETER); + Simple_Server_var server = Simple_Server::_narrow (objOne.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -89,18 +89,18 @@ int 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); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.cpp b/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.cpp index fa6a8f0d36e..e9ad3018cc1 100644 --- a/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.cpp +++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.cpp @@ -10,7 +10,7 @@ Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb) } void -Simple_Server_i::sendCharSeq (const Char_Seq & TAO_ENV_ARG_DECL_NOT_USED) +Simple_Server_i::sendCharSeq (const Char_Seq & ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { Simple_Server_count++; @@ -18,7 +18,7 @@ Simple_Server_i::sendCharSeq (const Char_Seq & TAO_ENV_ARG_DECL_NOT_USED) } void -Simple_Server_i::sendOctetSeq (const Octet_Seq & TAO_ENV_ARG_DECL_NOT_USED) +Simple_Server_i::sendOctetSeq (const Octet_Seq & ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { Simple_Server_count++; @@ -27,7 +27,7 @@ Simple_Server_i::sendOctetSeq (const Octet_Seq & TAO_ENV_ARG_DECL_NOT_USED) CORBA::Long Simple_Server_i::get_number (CORBA::Long - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Long tmp = Simple_Server_count; @@ -36,14 +36,14 @@ Simple_Server_i::get_number (CORBA::Long } void -Simple_Server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Simple_Server_i::shutdown\n")); ACE_TRY { - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.h b/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.h index fe54f70163b..27dccfeb62d 100644 --- a/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.h +++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.h @@ -31,16 +31,16 @@ public: // ctor // = The Simple_Server methods. - void sendCharSeq (const Char_Seq & charSeq TAO_ENV_ARG_DECL_NOT_USED) + void sendCharSeq (const Char_Seq & charSeq ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void sendOctetSeq (const Octet_Seq & octetSeq TAO_ENV_ARG_DECL_NOT_USED) + void sendOctetSeq (const Octet_Seq & octetSeq ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Long get_number (CORBA::Long num TAO_ENV_ARG_DECL_NOT_USED) + CORBA::Long get_number (CORBA::Long num ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (TAO_ENV_SINGLE_ARG_DECL) + void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: |