diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-10-13 06:20:39 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-10-13 06:20:39 +0000 |
| commit | aacd0408f68c197b9c2f7da2d9a2df6a13bba971 (patch) | |
| tree | c97e91d9224396fa4ed742659a9500137760b34a /ACE/ace/Framework_Component.inl | |
| parent | 4c8fb3272d43a5a7eef778c7dbacc94ce3a508fc (diff) | |
| download | ATCD-aacd0408f68c197b9c2f7da2d9a2df6a13bba971.tar.gz | |
Wed Oct 13 06:15:00 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/Framework_Component.h:
* ace/Framework_Component.inl:
* ace/Framework_Component.cpp:
* ace/Framework_Component_T.h:
Use ACE_Copy_Disabled, change c-style cast to const cast, use
sync macros instead of ACE_MT. Thanks to Ranjit Hande
<hande at avaya dot com> for reporting the c-style cast warnings
* tests/Framework_Component_Test.h:
Layout change
Diffstat (limited to 'ACE/ace/Framework_Component.inl')
| -rw-r--r-- | ACE/ace/Framework_Component.inl | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ACE/ace/Framework_Component.inl b/ACE/ace/Framework_Component.inl index 2c3c2130a53..0d3384fcaa1 100644 --- a/ACE/ace/Framework_Component.inl +++ b/ACE/ace/Framework_Component.inl @@ -1,5 +1,4 @@ // -*- C++ -*- -// // $Id$ #include "ace/ACE.h" @@ -24,7 +23,7 @@ ACE_INLINE int ACE_Framework_Repository::current_size (void) const { ACE_TRACE ("ACE_Framework_Repository::current_size"); - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, (ACE_Thread_Mutex &) this->lock_, -1)); + ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, const_cast <ACE_SYNCH_MUTEX&>(this->lock_), -1); return this->current_size_; } @@ -32,7 +31,7 @@ ACE_INLINE int ACE_Framework_Repository::total_size (void) const { ACE_TRACE ("ACE_Framework_Repository::total_size"); - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, (ACE_Thread_Mutex &) this->lock_, -1)); + ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, const_cast <ACE_SYNCH_MUTEX&>(this->lock_), -1); return this->total_size_; } |