diff options
| author | okellogg <okellogg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-01-29 20:21:11 +0000 |
|---|---|---|
| committer | okellogg <okellogg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-01-29 20:21:11 +0000 |
| commit | 56681ffa90714cf82c32e907c0f80cea75166740 (patch) | |
| tree | fd798ba5478a08b4b6f842cb8515ed9776861f5f /TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp | |
| parent | 6b5e98c78a7f66029147fad41e2e75cea35854aa (diff) | |
| download | ATCD-56681ffa90714cf82c32e907c0f80cea75166740.tar.gz | |
ChangeLogTag:Tue Jan 29 21:09:12 2002 Oliver Kellogg <oliver.kellogg@sysde.eads.net>
Diffstat (limited to 'TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp')
| -rw-r--r-- | TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp b/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp index a6299288c56..2f52e21c41c 100644 --- a/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp +++ b/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp @@ -47,7 +47,7 @@ Callback_i::~Callback_i (void) void Callback_i::next_chunk (const Web_Server::Chunk_Type & chunk_data, CORBA::Boolean last_chunk - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (!last_chunk) @@ -93,7 +93,7 @@ Callback_i::next_chunk (const Web_Server::Chunk_Type & chunk_data, if (this->metadata_received ()) { (void) this->file_io_.close (); - this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); + this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; (void) this->spawn_viewer (); @@ -104,7 +104,7 @@ Callback_i::next_chunk (const Web_Server::Chunk_Type & chunk_data, void Callback_i::metadata (const Web_Server::Metadata_Type &metadata) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { { @@ -126,7 +126,7 @@ Callback_i::metadata (const Web_Server::Metadata_Type &metadata) // an external viewer to display it. if (this->content_received ()) { - this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); + this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; (void) this->spawn_viewer (); @@ -273,19 +273,19 @@ Callback_i::spawn_viewer (void) } void -Callback_i::deactivate (TAO_ENV_SINGLE_ARG_DECL) +Callback_i::deactivate (ACE_ENV_SINGLE_ARG_DECL) { // Get the POA used when activating the Reply Handler object. - PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Get the object ID associated with this servant. PortableServer::ObjectId_var oid = poa->servant_to_id (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Now deactivate the iterator object. - poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } |