Update of /cvsroot/pclasses/pclasses2/include/pclasses/Util
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14574/include/pclasses/Util
Modified Files:
ManagedThread.h WorkQueue.h
Log Message:
- Changed return type of Thread::main() to long
Index: WorkQueue.h
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/include/pclasses/Util/WorkQueue.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- WorkQueue.h 28 Jan 2005 11:39:36 -0000 1.3
+++ WorkQueue.h 25 Apr 2005 10:51:14 -0000 1.4
@@ -22,12 +22,13 @@
#define _P_WorkQueue_h_
#include <pclasses/Queue.h>
-#include <pclasses/List.h>
#include <pclasses/System/Mutex.h>
#include <pclasses/System/Condition.h>
#include <pclasses/System/Semaphore.h>
#include <pclasses/Util/ManagedThread.h>
+#include <list>
+
namespace P {
namespace Util {
@@ -45,17 +46,17 @@
State state() const throw();
- int retVal() const throw();
+ long retVal() const throw();
void process();
protected:
- virtual int run() = 0;
+ virtual long run() = 0;
virtual void finish() = 0;
private:
State _state;
- int _retVal;
+ long _retVal;
};
class WorkQueue {
@@ -80,7 +81,7 @@
~WorkerThread() throw();
private:
- virtual int mainLoop();
+ virtual long mainLoop();
WorkQueue& _queue;
};
@@ -96,7 +97,7 @@
private:
WorkQueue& _queue;
unsigned int _numThreads;
- list<WorkerThread*> _threads;
+ std::list<WorkerThread*> _threads;
};
} // !namespace Utils
Index: ManagedThread.h
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/include/pclasses/Util/ManagedThread.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ManagedThread.h 28 Jan 2005 11:39:36 -0000 1.3
+++ ManagedThread.h 25 Apr 2005 10:51:14 -0000 1.4
@@ -75,7 +75,7 @@
resources. You should signal the thread to stop before
waiting for it's termination.
*/
- int join() throw(System::SystemError);
+ long join() throw(System::SystemError);
//! Wait for state-change
State wait(int stateMask);
@@ -107,7 +107,7 @@
\return zero if the initialization was the successfull,
non-zero exit-code otherwise.
*/
- virtual int init();
+ virtual long init();
//! Threads main-loop
/*!
@@ -116,7 +116,7 @@
The implementation of this method should frequently call
shouldRun() to allow suspend, resume and exit notifies.
*/
- virtual int mainLoop() = 0;
+ virtual long mainLoop() = 0;
//! Cleanup method
/*!
@@ -143,7 +143,7 @@
private:
//! Implements the Threads main-method
- virtual int main();
+ virtual long main();
//! Changes state and notifies the Condition
void changeState(State newState);
|
