diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp index e91e8fbc399..87bcc3c04f6 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp @@ -29,7 +29,7 @@ CC_LockSetFactory::~CC_LockSetFactory (void) } CosConcurrencyControl::LockSet_ptr -CC_LockSetFactory::create (CORBA::Environment &ACE_TRY_ENV) +CC_LockSetFactory::create (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CC_LockSet *ls = 0; @@ -41,25 +41,22 @@ CC_LockSetFactory::create (CORBA::Environment &ACE_TRY_ENV) CORBA::NO_MEMORY()); ACE_CHECK_RETURN (CosConcurrencyControl::LockSet::_nil ()); - return ls->_this (ACE_TRY_ENV); + return ls->_this (TAO_ENV_SINGLE_ARG_PARAMETER); } CosConcurrencyControl::LockSet_ptr -CC_LockSetFactory::create_related (CosConcurrencyControl::LockSet_ptr which, - CORBA::Environment &ACE_TRY_ENV) +CC_LockSetFactory::create_related (CosConcurrencyControl::LockSet_ptr which + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CC_LockSet *ls = 0; ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CosConcurrencyControl::LockSet::_nil ()); - // @@ I commented out the following statement becuase it doesn't make any - // sense at all. -- Nanbor - // TAO_IN_ENV.exception (new CORBA::NO_MEMORY ()); ACE_NEW_THROW_EX (ls, CC_LockSet (which), CORBA::NO_MEMORY()); ACE_CHECK_RETURN (CosConcurrencyControl::LockSet::_nil ()); - return ls->_this (ACE_TRY_ENV); + return ls->_this (TAO_ENV_SINGLE_ARG_PARAMETER); } |