diff options
Diffstat (limited to 'TAO/tests/RTCORBA/Client_Propagated/server.cpp')
| -rw-r--r-- | TAO/tests/RTCORBA/Client_Propagated/server.cpp | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/TAO/tests/RTCORBA/Client_Propagated/server.cpp b/TAO/tests/RTCORBA/Client_Propagated/server.cpp index 21af1d36fdb..a22a3155703 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/server.cpp +++ b/TAO/tests/RTCORBA/Client_Propagated/server.cpp @@ -17,10 +17,10 @@ public: // = The Test methods. void test_method (CORBA::Short priority - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -35,25 +35,25 @@ Test_i::Test_i (CORBA::ORB_ptr orb) void Test_i::test_method (CORBA::Short priority - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Use RTCurrent to find out the CORBA priority of the current // thread. CORBA::Object_var obj = - this->orb_->resolve_initial_references ("RTCurrent" TAO_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("RTCurrent" ACE_ENV_ARG_PARAMETER); ACE_CHECK; RTCORBA::Current_var current = - RTCORBA::Current::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + RTCORBA::Current::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (obj.in ())) ACE_THROW (CORBA::INTERNAL ()); CORBA::Short servant_thread_priority = - current->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER); + current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Print out the info. @@ -69,10 +69,10 @@ Test_i::test_method (CORBA::Short priority } void -Test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } //************************************************************************* @@ -119,18 +119,18 @@ main (int argc, char *argv[]) // parse arguments and get all the references (ORB, // RootPOA, RTORB, RTCurrent, POAManager). 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->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) @@ -139,20 +139,20 @@ main (int argc, char *argv[]) -1); 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; - object = orb->resolve_initial_references ("RTORB" TAO_ENV_ARG_PARAMETER); + object = orb->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; object = - orb->resolve_initial_references ("RTCurrent" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RTCurrent" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RTCORBA::Current_var current = - RTCORBA::Current::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + RTCORBA::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Create POA with CLIENT_PROPAGATED PriorityModelPolicy, @@ -162,30 +162,30 @@ main (int argc, char *argv[]) poa_policy_list[0] = rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var child_poa = root_poa->create_POA ("Child_POA", poa_manager.in (), poa_policy_list - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test_i server_impl (orb.in ()); PortableServer::ObjectId_var id = - child_poa->activate_object (&server_impl TAO_ENV_ARG_PARAMETER); + child_poa->activate_object (&server_impl ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var server = child_poa->id_to_reference (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Print Object IOR. 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\n", ior.in ())); @@ -204,21 +204,21 @@ main (int argc, char *argv[]) // Get the initial priority of the current thread. CORBA::Short initial_thread_priority = - current->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER); + current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Run ORB Event loop. - 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, "Server ORB event loop finished\n")); // Get the final priority of the current thread. CORBA::Short final_thread_priority = - current->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER); + current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (final_thread_priority != initial_thread_priority) |