summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/ImplRepo_Service/Iterator.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/ImplRepo_Service/Iterator.cpp')
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/Iterator.cpp11
1 files changed, 4 insertions, 7 deletions
diff --git a/TAO/orbsvcs/ImplRepo_Service/Iterator.cpp b/TAO/orbsvcs/ImplRepo_Service/Iterator.cpp
index 1ed369991c2..b30cb4ab1f3 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Iterator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Iterator.cpp
@@ -22,8 +22,7 @@ ImR_Iterator::ImR_Iterator (CORBA::ULong n, Locator_Repository& repo, PortableSe
CORBA::Boolean
ImR_Iterator::next_n (CORBA::ULong how_many,
- ImplementationRepository::ServerInformationList_out server_list
- ACE_ENV_ARG_DECL)
+ ImplementationRepository::ServerInformationList_out server_list)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_NEW_THROW_EX (server_list,
@@ -81,11 +80,9 @@ ImR_Iterator::next_n (CORBA::ULong how_many,
void
-ImR_Iterator::destroy (ACE_ENV_SINGLE_ARG_DECL)
+ImR_Iterator::destroy (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- PortableServer::ObjectId_var oid = poa_->servant_to_id (this ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- poa_->deactivate_object (oid.in() ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
+ PortableServer::ObjectId_var oid = poa_->servant_to_id (this);
+ poa_->deactivate_object (oid.in());
}