diff options
Diffstat (limited to 'TAO/examples/Content_Server/SMI_Iterator/server.cpp')
| -rw-r--r-- | TAO/examples/Content_Server/SMI_Iterator/server.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/TAO/examples/Content_Server/SMI_Iterator/server.cpp b/TAO/examples/Content_Server/SMI_Iterator/server.cpp index 63ec2db16cf..0ff14a044c1 100644 --- a/TAO/examples/Content_Server/SMI_Iterator/server.cpp +++ b/TAO/examples/Content_Server/SMI_Iterator/server.cpp @@ -13,46 +13,46 @@ ACE_RCSID(SMI_Iterator, server, "$Id$") int main (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // Initialize the ORB. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "Mighty ORB", - ACE_TRY_ENV); + "Mighty ORB" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the Root POA. CORBA::Object_var obj = - orb->resolve_initial_references ("RootPOA", - ACE_TRY_ENV); + orb->resolve_initial_references ("RootPOA" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = - PortableServer::POA::_narrow (obj.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Activate the POA manager. PortableServer::POAManager_var mgr = poa->the_POAManager (); - mgr->activate (ACE_TRY_ENV); + mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Create the Iterator_Factory servant and object. // It activates and deactivates the Content_Iterator object. Iterator_Factory_i factory_servant; Web_Server::Iterator_Factory_var factory = - factory_servant._this (ACE_TRY_ENV); + factory_servant._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Get a reference to the Name Service. - obj = orb->resolve_initial_references ("NameService", - ACE_TRY_ENV); + obj = orb->resolve_initial_references ("NameService" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Narrow to a Naming Context CosNaming::NamingContext_var nc; - nc = CosNaming::NamingContext::_narrow (obj.in (), ACE_TRY_ENV); + nc = CosNaming::NamingContext::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Create a name. @@ -61,12 +61,12 @@ main (int argc, char *argv[]) name[0].id = CORBA::string_dup ("Iterator_Factory"); name[0].kind = CORBA::string_dup (""); - nc->bind (name, factory.in (), ACE_TRY_ENV); + nc->bind (name, factory.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Some debugging output. - CORBA::String_var IOR = orb->object_to_string (factory.in (), - ACE_TRY_ENV); + CORBA::String_var IOR = orb->object_to_string (factory.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Bound <%s> to <%s> in Name Service.\n"), @@ -77,7 +77,7 @@ main (int argc, char *argv[]) ACE_TEXT ("Accepting requests.\n"))); // Accept requests. - orb->run (ACE_TRY_ENV); + orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY |