summaryrefslogtreecommitdiff
path: root/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp
diff options
context:
space:
mode:
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.cpp12
1 files changed, 6 insertions, 6 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 8b253015f81..a382f854632 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp
+++ b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp
@@ -25,8 +25,8 @@ Content_Iterator_i::~Content_Iterator_i (void)
CORBA::Boolean
Content_Iterator_i::next_chunk (CORBA::ULong offset,
- Web_Server::Chunk_Type_out chunk,
- CORBA::Environment &)
+ Web_Server::Chunk_Type_out chunk
+ TAO_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// Initialize/allocate the Chunk_Type sequence
@@ -105,23 +105,23 @@ Content_Iterator_i::next_chunk (CORBA::ULong offset,
}
void
-Content_Iterator_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+Content_Iterator_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
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_TRY_ENV);
+ this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK;
// Get the object ID associated with this servant.
PortableServer::ObjectId_var oid =
- poa->servant_to_id (this, ACE_TRY_ENV);
+ poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
ACE_CHECK;
// Now deactivate the iterator object.
- poa->deactivate_object (oid.in (), ACE_TRY_ENV);
+ poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER);
ACE_CHECK;
// Decrease the reference count on our selves.