summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 10:30:16 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 10:30:16 +0000
commit6bb358d23c38c45a2eb61d6eba7accee66160dbf (patch)
tree8a537883eb6fb9c3d1ac2dac86136f781eecc99d
parent354800009af9eac865a58b99168de78d2a0bd026 (diff)
INTEGRATION: CWS warnings01 (1.4.32); FILE MERGED
2005/10/28 14:48:41 cd 1.4.32.1: #i55991# Warning free code changes for gcc
-rw-r--r--framework/source/threadhelp/lockhelper.cxx28
1 files changed, 14 insertions, 14 deletions
diff --git a/framework/source/threadhelp/lockhelper.cxx b/framework/source/threadhelp/lockhelper.cxx
index 176f6b1b50df..86c0a940d85d 100644
--- a/framework/source/threadhelp/lockhelper.cxx
+++ b/framework/source/threadhelp/lockhelper.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: lockhelper.cxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: rt $ $Date: 2005-09-09 01:47:56 $
+ * last change: $Author: hr $ $Date: 2006-06-19 11:30:16 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -92,16 +92,16 @@ namespace framework{
@onerror -
*//*-*************************************************************************************************************/
LockHelper::LockHelper( ::vos::IMutex* pSolarMutex )
- : m_pOwnMutex ( NULL )
+ : m_pFairRWLock ( NULL )
+ , m_pOwnMutex ( NULL )
, m_pSolarMutex ( NULL )
- , m_pFairRWLock ( NULL )
, m_pShareableOslMutex( NULL )
, m_bDummySolarMutex ( sal_False )
{
m_eLockType = implts_getLockType();
switch( m_eLockType )
{
- //case E_NOTHING : // There is nothing to do ...
+ case E_NOTHING : break; // There is nothing to do ...
case E_OWNMUTEX : {
m_pOwnMutex = new ::osl::Mutex;
}
@@ -195,7 +195,7 @@ void LockHelper::acquire()
{
switch( m_eLockType )
{
- //case E_NOTHING : // There is nothing to do ...
+ case E_NOTHING : break; // There is nothing to do ...
case E_OWNMUTEX : {
m_pOwnMutex->acquire();
}
@@ -232,7 +232,7 @@ void LockHelper::release()
{
switch( m_eLockType )
{
- //case E_NOTHING : // There is nothing to do ...
+ case E_NOTHING : break; // There is nothing to do ...
case E_OWNMUTEX : {
m_pOwnMutex->release();
}
@@ -269,7 +269,7 @@ void LockHelper::acquireReadAccess()
{
switch( m_eLockType )
{
- //case E_NOTHING : // There is nothing to do ...
+ case E_NOTHING : break; // There is nothing to do ...
case E_OWNMUTEX : {
m_pOwnMutex->acquire();
}
@@ -305,7 +305,7 @@ void LockHelper::releaseReadAccess()
{
switch( m_eLockType )
{
- //case E_NOTHING : // There is nothing to do ...
+ case E_NOTHING : break; // There is nothing to do ...
case E_OWNMUTEX : {
m_pOwnMutex->release();
}
@@ -343,7 +343,7 @@ void LockHelper::acquireWriteAccess()
{
switch( m_eLockType )
{
- //case E_NOTHING : // There is nothing to do ...
+ case E_NOTHING : break; // There is nothing to do ...
case E_OWNMUTEX : {
m_pOwnMutex->acquire();
}
@@ -379,7 +379,7 @@ void LockHelper::releaseWriteAccess()
{
switch( m_eLockType )
{
- //case E_NOTHING : // There is nothing to do ...
+ case E_NOTHING : break; // There is nothing to do ...
case E_OWNMUTEX : {
m_pOwnMutex->release();
}
@@ -423,9 +423,9 @@ void LockHelper::downgradeWriteAccess()
{
switch( m_eLockType )
{
- //case E_NOTHING : // There is nothing to do ...
- //case E_OWNMUTEX : // Not supported for mutex!
- //case E_SOLARMUTEX : // Not supported for mutex!
+ case E_NOTHING : break; // There is nothing to do ...
+ case E_OWNMUTEX : break; // Not supported for mutex!
+ case E_SOLARMUTEX : break; // Not supported for mutex!
case E_FAIRRWLOCK : m_pFairRWLock->downgradeWriteAccess();
break;
}