diff options
Diffstat (limited to 'TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp')
| -rw-r--r-- | TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp index 95aa978da82..55754368e9a 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp +++ b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp @@ -26,8 +26,7 @@ Content_Iterator_i::~Content_Iterator_i (void) CORBA::Boolean Content_Iterator_i::next_chunk (CORBA::ULongLong offset, - Web_Server::Chunk_Type_out chunk - ACE_ENV_ARG_DECL_NOT_USED) + Web_Server::Chunk_Type_out chunk) ACE_THROW_SPEC ((CORBA::SystemException)) { // Initialize/allocate the Chunk_Type sequence @@ -106,28 +105,24 @@ Content_Iterator_i::next_chunk (CORBA::ULongLong offset, } void -Content_Iterator_i::destroy (ACE_ENV_SINGLE_ARG_DECL) +Content_Iterator_i::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { (void) this->file_io_.close (); // Get the POA used when activating the Content_Iterator object. PortableServer::POA_var poa = - this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->_default_POA (); // Get the object ID associated with this servant. PortableServer::ObjectId_var oid = - poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + poa->servant_to_id (this); // Now deactivate the iterator object. - poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + poa->deactivate_object (oid.in ()); // Decrease the reference count on our selves. - this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->_remove_ref (); } int |