diff options
Diffstat (limited to 'TAO/examples/Content_Server/SMI_Iterator/client.cpp')
| -rw-r--r-- | TAO/examples/Content_Server/SMI_Iterator/client.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/TAO/examples/Content_Server/SMI_Iterator/client.cpp b/TAO/examples/Content_Server/SMI_Iterator/client.cpp index c6c3e47d613..7c8cb92ce27 100644 --- a/TAO/examples/Content_Server/SMI_Iterator/client.cpp +++ b/TAO/examples/Content_Server/SMI_Iterator/client.cpp @@ -14,7 +14,7 @@ ACE_RCSID(SMI_Iterator, client, "$Id$") // Retrieve the data from the server int retrieve_data (const char *content_type, Web_Server::Content_Iterator_ptr contents - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Map content type to viewer. @@ -29,7 +29,7 @@ int spawn_viewer (const char *content_type, int main (int argc, char *argv[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { if (argc < 2) @@ -41,18 +41,18 @@ main (int argc, char *argv[]) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "Mighty ORB" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get a reference to the Name Service. CORBA::Object_var obj = orb->resolve_initial_references ("NameService" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Narrow to a Naming Context CosNaming::NamingContext_var nc = - CosNaming::NamingContext::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + CosNaming::NamingContext::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (obj.in ())) @@ -69,7 +69,7 @@ main (int argc, char *argv[]) name[0].id = CORBA::string_dup ("Iterator_Factory"); name[0].kind = CORBA::string_dup (""); - obj = nc->resolve (name TAO_ENV_ARG_PARAMETER); + obj = nc->resolve (name ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Now narrow to an Iterator_Factory reference. @@ -93,7 +93,7 @@ main (int argc, char *argv[]) factory->get_iterator (pathname, contents, metadata - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_INFO, @@ -107,20 +107,20 @@ main (int argc, char *argv[]) int result = ::retrieve_data (metadata->content_type.in (), contents.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result != 0) return -1; // Done with the Content_Iterator, so destroy it. - contents->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + contents->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->shutdown (0 TAO_ENV_ARG_PARAMETER); + orb->shutdown (0 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_CATCH (Web_Server::Error_Result, exc) @@ -149,7 +149,7 @@ main (int argc, char *argv[]) int retrieve_data (const char *content_type, Web_Server::Content_Iterator_ptr iterator - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { Web_Server::Content_Iterator_var contents = Web_Server::Content_Iterator::_duplicate (iterator); @@ -179,7 +179,7 @@ int retrieve_data (const char *content_type, for (;;) { - rc = contents->next_chunk (offset, chunk TAO_ENV_ARG_PARAMETER); + rc = contents->next_chunk (offset, chunk ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (!rc) |