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

2 files changed, 7 insertions, 13 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;
             }
diff --git a/cppu/source/threadpool/jobqueue.hxx b/cppu/source/threadpool/jobqueue.hxx
index 38ad71e51254..c1c87902e79f 100644
--- a/cppu/source/threadpool/jobqueue.hxx
+++ b/cppu/source/threadpool/jobqueue.hxx
@@ -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();