summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp')
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp
index f8ad8bd3a6f..1deb800e3a0 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp
@@ -39,7 +39,7 @@ add_offer (CosTrading::OfferId id,
template <class MAP_LOCK_TYPE> CORBA::ULong
TAO_Register_Offer_Iterator<MAP_LOCK_TYPE>::
-max_left (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+max_left (void)
ACE_THROW_SPEC ((CORBA::SystemException,
CosTrading::UnknownMaxLeft))
{
@@ -49,8 +49,7 @@ max_left (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
template <class MAP_LOCK_TYPE> CORBA::Boolean
TAO_Register_Offer_Iterator<MAP_LOCK_TYPE>::
next_n (CORBA::ULong n,
- CosTrading::OfferSeq_out offers
- ACE_ENV_ARG_DECL)
+ CosTrading::OfferSeq_out offers)
ACE_THROW_SPEC ((CORBA::SystemException))
{
CORBA::ULong ret_offers = 0;
@@ -62,7 +61,6 @@ next_n (CORBA::ULong n,
ACE_NEW_THROW_EX (offers,
CosTrading::OfferSeq,
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
offers->length (max_possible_offers_in_sequence);
@@ -78,8 +76,7 @@ next_n (CORBA::ULong n,
this->offer_ids_.dequeue_head (id);
CosTrading::OfferId_var offerid_var (id);
- CosTrading::Offer* offer = this->db_.lookup_offer (id ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ CosTrading::Offer* offer = this->db_.lookup_offer (id);
if (offer != 0)
this->pfilter_.filter_offer (offer,