From: Christian P. <cp...@us...> - 2005-04-25 10:51:24
|
Update of /cvsroot/pclasses/pclasses2/src/Util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14574/src/Util Modified Files: ManagedThread.cpp WorkQueue.cpp Log Message: - Changed return type of Thread::main() to long Index: ManagedThread.cpp =================================================================== RCS file: /cvsroot/pclasses/pclasses2/src/Util/ManagedThread.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ManagedThread.cpp 28 Jan 2005 11:39:37 -0000 1.2 +++ ManagedThread.cpp 25 Apr 2005 10:51:15 -0000 1.3 @@ -76,9 +76,9 @@ } } -int ManagedThread::join() throw(SystemError) +long ManagedThread::join() throw(SystemError) { - int ret = Thread::join(); + long ret = Thread::join(); _shouldSuspend = false; _shouldStop = false; changeState(Stopped); @@ -100,7 +100,7 @@ return true; } -int ManagedThread::init() +long ManagedThread::init() { return 0; } @@ -117,9 +117,9 @@ { } -int ManagedThread::main() +long ManagedThread::main() { - int ret = init(); + long ret = init(); if(ret != 0) { changeState(Failed); Index: WorkQueue.cpp =================================================================== RCS file: /cvsroot/pclasses/pclasses2/src/Util/WorkQueue.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- WorkQueue.cpp 28 Jan 2005 11:39:37 -0000 1.3 +++ WorkQueue.cpp 25 Apr 2005 10:51:15 -0000 1.4 @@ -39,7 +39,7 @@ return _state; } -int WorkItem::retVal() const throw() +long WorkItem::retVal() const throw() { return _retVal; } @@ -116,7 +116,7 @@ { } -int WorkerThread::mainLoop() +long WorkerThread::mainLoop() { WorkItem* item = 0; @@ -152,7 +152,7 @@ { while(_numThreads > numThreads) { - list<WorkerThread*>::iterator i = _threads.begin(); + std::list<WorkerThread*>::iterator i = _threads.begin(); WorkerThread* thread = *i; thread->stop(); thread->join(); |