diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2001-01-09 15:23:21 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2001-01-09 15:23:21 +0000 |
| commit | fb862b7d3a18b243fa88d4c1efd70425c2022b01 (patch) | |
| tree | f9b3b7842026aa94c0999b7121168094b7efccb0 | |
| parent | 5a4dae70605ac9e0d64df5940cef88f5b1afe686 (diff) | |
| download | ATCD-fb862b7d3a18b243fa88d4c1efd70425c2022b01.tar.gz | |
ChangeLogTag: Tue Jan 9 09:13:49 2001 Balachandran Natarajan <bala@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp | 18 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.i | 25 |
3 files changed, 27 insertions, 22 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 659a4c6dbb5..cd438c67ef4 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,9 @@ +Tue Jan 9 09:13:49 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp: + * orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.i: Fixed compiler + errors in SPRO 5.1. + Mon Jan 8 17:27:29 2001 Darrell Brunsch <brunsch@uci.edu> * tao/Policy_Manager.cpp: diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp index f6af9df406a..9c4bc9459b0 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp @@ -15,28 +15,28 @@ ACE_RCSID(ESF, ESF_Immediate_Changes, "$Id$") // **************************************************************** -template<class PROXY, class C, class I, class L> -TAO_ESF_Immediate_Changes<PROXY,C,I,L>:: +template<class PROXY, class C, class ITERATOR, class ACE_LOCK> +TAO_ESF_Immediate_Changes<PROXY,C,ITERATOR,ACE_LOCK>:: TAO_ESF_Immediate_Changes (void) { } -template<class PROXY, class C, class I, class L> -TAO_ESF_Immediate_Changes<PROXY,C,I,L>:: +template<class PROXY, class C, class ITERATOR, class ACE_LOCK> +TAO_ESF_Immediate_Changes<PROXY,C,ITERATOR,ACE_LOCK>:: TAO_ESF_Immediate_Changes (const C &collection) : collection_ (collection) { } -template<class PROXY, class C, class I, class L> void -TAO_ESF_Immediate_Changes<PROXY,C,I,L>:: +template<class PROXY, class C, class ITERATOR, class ACE_LOCK> void +TAO_ESF_Immediate_Changes<PROXY,C,ITERATOR,ACE_LOCK>:: for_each (TAO_ESF_Worker<PROXY> *worker, CORBA::Environment &ACE_TRY_ENV) { - ACE_GUARD (L, ace_mon, this->lock_); + ACE_GUARD (ACE_LOCK, ace_mon, this->lock_); - I end = this->collection_.end (); - for (I i = this->collection_.begin (); i != end; ++i) + ITERATOR end = this->collection_.end (); + for (ITERATOR i = this->collection_.begin (); i != end; ++i) { worker->work ((*i), ACE_TRY_ENV); ACE_CHECK; diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.i index 7ffce621b6b..383a59fa0c6 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.i +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.i @@ -1,43 +1,42 @@ // $Id$ -template<class PROXY, class C, class I, class L> void -TAO_ESF_Immediate_Changes<PROXY,C,I,L>:: +template<class PROXY, class C, class I, class ACE_LOCK> void +TAO_ESF_Immediate_Changes<PROXY,C,I,ACE_LOCK>:: connected (PROXY *proxy, CORBA::Environment &ACE_TRY_ENV) { - ACE_GUARD (L, ace_mon, this->lock_); + ACE_GUARD (ACE_LOCK, ace_mon, this->lock_); proxy->_incr_refcnt (); this->collection_.connected (proxy, ACE_TRY_ENV); } -template<class PROXY, class C, class I, class L> void -TAO_ESF_Immediate_Changes<PROXY,C,I,L>:: +template<class PROXY, class C, class I, class ACE_LOCK> void +TAO_ESF_Immediate_Changes<PROXY,C,I,ACE_LOCK>:: reconnected (PROXY *proxy, CORBA::Environment &ACE_TRY_ENV) { - ACE_GUARD (L, ace_mon, this->lock_); + ACE_GUARD (ACE_LOCK, ace_mon, this->lock_); proxy->_incr_refcnt (); this->collection_.reconnected (proxy, ACE_TRY_ENV); } -template<class PROXY, class C, class I, class L> void -TAO_ESF_Immediate_Changes<PROXY,C,I,L>:: +template<class PROXY, class C, class I, class ACE_LOCK> void +TAO_ESF_Immediate_Changes<PROXY,C,I,ACE_LOCK>:: disconnected (PROXY *proxy, CORBA::Environment &ACE_TRY_ENV) { - ACE_GUARD (L, ace_mon, this->lock_); + ACE_GUARD (ACE_LOCK, ace_mon, this->lock_); this->collection_.disconnected (proxy, ACE_TRY_ENV); } -template<class PROXY, class C, class I, class L> void -TAO_ESF_Immediate_Changes<PROXY,C,I,L>:: +template<class PROXY, class C, class I, class ACE_LOCK> void +TAO_ESF_Immediate_Changes<PROXY,C,I,ACE_LOCK>:: shutdown (CORBA::Environment &ACE_TRY_ENV) { - ACE_GUARD (L, ace_mon, this->lock_); + ACE_GUARD (ACE_LOCK, ace_mon, this->lock_); this->collection_.shutdown (ACE_TRY_ENV); } - |