summaryrefslogtreecommitdiff
path: root/cppu/source/threadpool/thread.cxx
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 12:12:31 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 12:12:31 +0000
commit926576c56756332e479c0b2a3dc43142aa397d73 (patch)
treea3471f8fe6e2a25b664e53843cd2df6492f1c6ea /cppu/source/threadpool/thread.cxx
parent9b8457a6d25718fc68fa556c688fe622307062c3 (diff)
INTEGRATION: CWS warnings01 (1.6.46); FILE MERGED
2005/09/22 20:43:02 sb 1.6.46.3: RESYNC: (1.6-1.7); FILE MERGED 2005/09/06 10:11:50 sb 1.6.46.2: #i53898# sal::reinterpret_int_cast is not needed. 2005/08/29 14:03:50 sb 1.6.46.1: #i53898# Made code warning-free.
Diffstat (limited to 'cppu/source/threadpool/thread.cxx')
-rw-r--r--cppu/source/threadpool/thread.cxx15
1 files changed, 10 insertions, 5 deletions
diff --git a/cppu/source/threadpool/thread.cxx b/cppu/source/threadpool/thread.cxx
index 9616d687023f..85cbfe9631c8 100644
--- a/cppu/source/threadpool/thread.cxx
+++ b/cppu/source/threadpool/thread.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: thread.cxx,v $
*
- * $Revision: 1.9 $
+ * $Revision: 1.10 $
*
- * last change: $Author: kz $ $Date: 2006-04-26 20:50:06 $
+ * last change: $Author: hr $ $Date: 2006-06-19 13:12:31 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -184,8 +184,10 @@ namespace cppu_threadpool {
{
if( ! m_bAsynchron )
{
- sal_Bool bReturn = uno_bindIdToCurrentThread( m_aThreadId.getHandle() );
- OSL_ASSERT( bReturn );
+ if ( !uno_bindIdToCurrentThread( m_aThreadId.getHandle() ) )
+ {
+ OSL_ASSERT( false );
+ }
}
while( ! m_pQueue->isEmpty() )
@@ -193,7 +195,10 @@ namespace cppu_threadpool {
// Note : Oneways should not get a disposable disposeid,
// It does not make sense to dispose a call in this state.
// That's way we put it an disposeid, that can't be used otherwise.
- m_pQueue->enter( (sal_Int64 ) this , sal_True );
+ m_pQueue->enter(
+ sal::static_int_cast< sal_Int64 >(
+ reinterpret_cast< sal_IntPtr >(this)),
+ sal_True );
if( m_pQueue->isEmpty() )
{