strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS jsc9 (1.4.2); FILE MERGED

Browse source 
2006/04/26 14:15:32 jsc 1.4.2.1: #134738# move fixes back to previous version
This commit is contained in:
Kurt Zenker 2006-04-26 19:49:54 +00:00
parent 9b57f31cc4
commit 54ec29f389
2 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cppu/source/threadpool/jobqueue.cxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: jobqueue.cxx,v $
*
* $Revision: 1.4 $
* $Revision: 1.5 $
*
* last change: $Author: hr $ $Date: 2006-04-19 13:48:46 $
* last change: $Author: kz $ $Date: 2006-04-26 20:49:42 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -68,15 +68,13 @@ namespace cppu_threadpool {
m_nToDo ++;
}
void *JobQueue::enter(
DisposedCallerAdmin & disposedCallerAdmin, sal_Int64 nDisposeId,
sal_Bool bReturnWhenNoJob )
void *JobQueue::enter( sal_Int64 nDisposeId , sal_Bool bReturnWhenNoJob )
{
void *pReturn = 0;
{
// synchronize with the dispose calls
MutexGuard guard( m_mutex );
if( disposedCallerAdmin.isDisposed( nDisposeId ) )
if( DisposedCallerAdmin::getInstance()->isDisposed( nDisposeId ) )
{
return 0;
}

10
cppu/source/threadpool/jobqueue.hxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: jobqueue.hxx,v $
*
* $Revision: 1.4 $
* $Revision: 1.5 $
*
* last change: $Author: hr $ $Date: 2006-04-19 13:48:56 $
* last change: $Author: kz $ $Date: 2006-04-26 20:49:54 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -47,8 +47,6 @@
namespace cppu_threadpool
{
class DisposedCallerAdmin;
struct Job
{
void *pThreadSpecificData;
@ -68,9 +66,7 @@ namespace cppu_threadpool
void add( void *pThreadSpecificData ,
void ( SAL_CALL * doRequest ) ( void *pThreadSpecificData ) );
void *enter(
DisposedCallerAdmin & disposedCallerAdmin, sal_Int64 nDisposeId,
sal_Bool bReturnWhenNoJob = sal_False );
void *enter( sal_Int64 nDisposeId , sal_Bool bReturnWhenNoJob = sal_False );
void dispose( sal_Int64 nDisposeId );
void suspend();