summaryrefslogtreecommitdiff
path: root/cppu/source/threadpool/thread.cxx
diff options
context:
space:
mode:
authorSander Vesik <svesik@openoffice.org>2004-04-21 11:57:06 +0000
committerSander Vesik <svesik@openoffice.org>2004-04-21 11:57:06 +0000
commit924b8ed5447e04afd8dd5fc27021ad8a3e8658d4 (patch)
tree3f17af6d99290dfa30c38d37d0b3b692555b8f1b /cppu/source/threadpool/thread.cxx
parentdb83509ccf5a9d0640d0de5d87c5206887458c57 (diff)
INTEGRATION: CWS ooo20040329 (1.5.70); FILE MERGED
2004/03/15 12:56:57 waratah 1.5.70.1: #i1858# correct some ordering on the class definition to stop some warnings under -Wall Break apart an assignment from an if statement to remove another warning
Diffstat (limited to 'cppu/source/threadpool/thread.cxx')
-rw-r--r--cppu/source/threadpool/thread.cxx11
1 files changed, 6 insertions, 5 deletions
diff --git a/cppu/source/threadpool/thread.cxx b/cppu/source/threadpool/thread.cxx
index 2f1357545f86..6a5ccb4f837e 100644
--- a/cppu/source/threadpool/thread.cxx
+++ b/cppu/source/threadpool/thread.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: thread.cxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: vg $ $Date: 2003-04-15 16:36:38 $
+ * last change: $Author: svesik $ $Date: 2004-04-21 12:57:06 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -149,8 +149,8 @@ namespace cppu_threadpool {
ORequestThread::ORequestThread( JobQueue *pQueue,
const ByteSequence &aThreadId,
sal_Bool bAsynchron )
- : m_pQueue( pQueue )
- , m_thread( 0 )
+ : m_thread( 0 )
+ , m_pQueue( pQueue )
, m_aThreadId( aThreadId )
, m_bAsynchron( bAsynchron )
, m_bDeleteSelf( sal_True )
@@ -181,7 +181,8 @@ namespace cppu_threadpool {
{
OSL_ASSERT(m_thread == 0); // only one running thread per instance
- if ( m_thread = osl_createSuspendedThread( cppu_requestThreadWorker, (void*)this))
+ m_thread = osl_createSuspendedThread( cppu_requestThreadWorker, (void*)this);
+ if ( m_thread )
{
osl_resumeThread( m_thread );
}