diff options
Diffstat (limited to 'TAO/examples/POA/Forwarding/server.cpp')
| -rw-r--r-- | TAO/examples/POA/Forwarding/server.cpp | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/TAO/examples/POA/Forwarding/server.cpp b/TAO/examples/POA/Forwarding/server.cpp index fd0acdefe82..eb617310753 100644 --- a/TAO/examples/POA/Forwarding/server.cpp +++ b/TAO/examples/POA/Forwarding/server.cpp @@ -64,7 +64,7 @@ parse_args (int argc, char **argv) PortableServer::POA_ptr setup_poa (PortableServer::POA_ptr root_poa - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Policies for the childPOA to be created. CORBA::PolicyList policies (2); @@ -73,17 +73,17 @@ setup_poa (PortableServer::POA_ptr root_poa // Tell the POA to use a servant manager. policies[0] = root_poa->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (PortableServer::POA::_nil ()); // Allow implicit activation. policies[1] = root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (PortableServer::POA::_nil ()); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (PortableServer::POA::_nil ()); // Create POA as child of RootPOA with the above policies. This POA @@ -92,7 +92,7 @@ setup_poa (PortableServer::POA_ptr root_poa root_poa->create_POA ("childPOA", poa_manager.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (PortableServer::POA::_nil ()); // Creation of childPOAs is over. Destroy the Policy objects. @@ -100,7 +100,7 @@ setup_poa (PortableServer::POA_ptr root_poa i < policies.length (); ++i) { - policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (PortableServer::POA::_nil ()); } @@ -110,14 +110,14 @@ setup_poa (PortableServer::POA_ptr root_poa MyFooServantActivator * create_servant_manager (CORBA::ORB_ptr orb, PortableServer::POA_ptr child_poa - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::Object_var forward_to; if (forward_to_ior) { forward_to = orb->string_to_object (forward_to_ior - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } @@ -129,7 +129,7 @@ create_servant_manager (CORBA::ORB_ptr orb, // Set MyFooServantActivator to be the servant activator. child_poa->set_servant_manager (activator - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); // For the code above, we're using the CORBA 3.0 servant manager // semantics supported by TAO. For CORBA 2.x ORBs you'd need to // use the following code in place of the previous line: @@ -138,7 +138,7 @@ create_servant_manager (CORBA::ORB_ptr orb, // activator->_this (); // // child_poa->set_servant_manager (servant_activator.in (), - // TAO_ENV_SINGLE_ARG_PARAMETER); + // ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); MyFooServant *servant = 0; @@ -152,12 +152,12 @@ create_servant_manager (CORBA::ORB_ptr orb, PortableServer::ServantBase_var servant_var (servant); Foo_var foo = - servant->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::String_var ior = orb->object_to_string (foo.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); FILE *output_file = ACE_OS::fopen (ior_output_file, "w"); @@ -183,7 +183,7 @@ main (int argc, if (result == -1) return -1; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB first. @@ -191,43 +191,43 @@ main (int argc, CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Obtain the RootPOA. CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POAManager of the RootPOA. 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; PortableServer::POA_var child_poa = setup_poa (root_poa.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ServantManager_var manager = create_servant_manager (orb.in (), child_poa.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - 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; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY |