diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-04-26 19:49:54 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-04-26 19:49:54 +0000 |
| commit | 54ec29f38981421ef2b500c215599591a7d49a92 (patch) | |
| tree | 641e9136fca068c9c5d007a5dddc0c20485ba217 /cppu/source/threadpool/jobqueue.cxx | |
| parent | 9b57f31cc436b6c483c97e799a270d6c02985b59 (diff) | |
INTEGRATION: CWS jsc9 (1.4.2); FILE MERGED
2006/04/26 14:15:32 jsc 1.4.2.1: #134738# move fixes back to previous version
Diffstat (limited to 'cppu/source/threadpool/jobqueue.cxx')
| -rw-r--r-- | cppu/source/threadpool/jobqueue.cxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/cppu/source/threadpool/jobqueue.cxx b/cppu/source/threadpool/jobqueue.cxx index accc4587b214..e2e3a2187f69 100644 --- a/cppu/source/threadpool/jobqueue.cxx +++ b/cppu/source/threadpool/jobqueue.cxx @@ -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; } |