diff options
| author | venkita <venkita@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-10-15 19:22:43 +0000 |
|---|---|---|
| committer | venkita <venkita@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-10-15 19:22:43 +0000 |
| commit | 71e08d4bd807ee266d18c73f944877dc1a34f85a (patch) | |
| tree | e93e4cdf67eadd8de90032ed6b74f9c19c4c290f /TAO/orbsvcs/orbsvcs/RTCosScheduling | |
| parent | a41efc8019efd4073d2b75f8f641ff51376c76c6 (diff) | |
| download | ATCD-71e08d4bd807ee266d18c73f944877dc1a34f85a.tar.gz | |
ChangeLogTag: Wed Oct 15 14:20:52 2003 Venkita Subramonian <venkita@cs.wustl.edu>
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/RTCosScheduling')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp index d7ff04632eb..40f3a707b9e 100644 --- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp @@ -90,7 +90,7 @@ CosSchedulingLockList::CosSchedulingLockList(CosSchedulingLockNode *lock_array, { lock_array[i].next(&lock_array[i + 1]); ACE_NEW_THROW_EX(lock_array[i].condition_, - ACE_Thread_Condition<ACE_Thread_Mutex>(*mutex), + ACE_SYNCH_CONDITION(*mutex), CORBA::NO_MEMORY()); } ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.h b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.h index ee789204bd5..6db001c86cb 100644 --- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.h +++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.h @@ -96,7 +96,7 @@ struct CosSchedulingLockNode int next_offset_; /// Condition Variable to wait on Mutex - ACE_Thread_Condition<ACE_Thread_Mutex> *condition_; + ACE_SYNCH_CONDITION *condition_; /** * Translates the offset to the next lock @@ -130,7 +130,7 @@ class CosSchedulingLockList * @param size The size of the lock list * @param mutex the mutex that guards the CosSchedulingLockList */ - CosSchedulingLockList(CosSchedulingLockNode *lock_array, int size, ACE_Thread_Mutex *mutex); + CosSchedulingLockList(CosSchedulingLockNode *lock_array, int size, ACE_SYNCH_MUTEX *mutex); /** * Calls ACE_Thread::remove() on all conditions in the list; @@ -162,7 +162,7 @@ class CosSchedulingLockList * @param mutex The mutex that guards the locks. */ int defer_lock(const CosSchedulingLockNode& L, - ACE_Thread_Mutex &mutex); + ACE_SYNCH_MUTEX &mutex); /** * Removes a node from the granted lock list whose threadID_ |