diff options
| author | Abdullah Sowayan <sowayan@users.noreply.github.com> | 2007-11-30 22:13:14 +0000 |
|---|---|---|
| committer | Abdullah Sowayan <sowayan@users.noreply.github.com> | 2007-11-30 22:13:14 +0000 |
| commit | 6eee8ae98b972dc8444327b4f288ef844eed438c (patch) | |
| tree | 1d3fb85cf9420c203f8c950ef62f19ba38511a97 | |
| parent | 53a899262d0013841524801cd3c55f05c90fae6a (diff) | |
| download | ATCD-6eee8ae98b972dc8444327b4f288ef844eed438c.tar.gz | |
Fri Nov 30 22:11:41 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com>
| -rw-r--r-- | CIAO/ChangeLog | 9 | ||||
| -rw-r--r-- | CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h | 4 |
2 files changed, 10 insertions, 3 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index d5c621a492c..e95d8c90da2 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,10 @@ +Fri Nov 30 22:11:41 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com> + + * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h: + + Replaced ACE_Thread_Mutex with TAO_SYNCH_MUTEX to allow this code + to work in single-threaded builds. + Fri Nov 30 19:06:05 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com> * DAnCE/Deployment/NodeApp_CB_Impl.h: @@ -17,7 +24,7 @@ Fri Nov 30 19:06:05 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com> * ciao/Swapping_Servant_Home_Impl_T.h: * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.h: - Parts of CIAO use TAO_SYNCH_MUTEX while other parts use ACE_SYNCH_MUTEX. + Parts of CIAO use TAO_SYNCH_MUTEX while other parts use ACE_SYNCH_MUTEX. All occurrences of ACE_SYNCH_MUTEX were replaced with TAO_SYNCH_MUTEX for consistency. diff --git a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h index d1297c2c000..50cfb3476e0 100644 --- a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h +++ b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h @@ -234,8 +234,8 @@ namespace CIAO pid_t process_id_; /// For synchronization between multiple threads - ACE_Condition<ACE_Thread_Mutex> waitCond_; - ACE_Thread_Mutex mutex_; + ACE_Condition<TAO_SYNCH_MUTEX> waitCond_; + TAO_SYNCH_MUTEX mutex_; }; |