Changeset 3231 for code/branches/netp6
- Timestamp:
- Jun 23, 2009, 9:59:04 PM (16 years ago)
- Location:
- code/branches/netp6/src
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/netp6/src/core/CorePrereqs.h
r3230 r3231 200 200 201 201 // Boost 202 namespace boost { 202 namespace boost 203 { 203 204 namespace filesystem 204 205 { -
code/branches/netp6/src/core/Thread.cc
r3230 r3231 35 35 #include <boost/thread/thread_time.hpp> 36 36 37 #include "core/Functor.h"38 37 #include "util/Sleep.h" 38 #include "Functor.h" 39 39 40 40 namespace orxonox -
code/branches/netp6/src/core/Thread.h
r3230 r3231 30 30 #define _Thread_H__ 31 31 32 33 32 #include "CorePrereqs.h" 34 33 35 34 namespace orxonox 36 35 { 37 38 class Thread 36 class _CoreExport Thread 39 37 { 40 38 public: 41 39 Thread(); 42 40 virtual ~Thread(); 43 44 inline bool isWorking(){ return this->isWorking_; }41 42 inline bool isWorking() { return this->isWorking_; } 45 43 void waitUntilFinished(); 46 44 bool evaluateFunctor( Functor* functor ); 47 45 48 46 private: 49 47 void threadLoop(); … … 55 53 boost::mutex* communicationMutex_; 56 54 }; 57 58 }59 55 56 } 60 57 61 #endif 58 #endif /* _Thread_H__ */ -
code/branches/netp6/src/core/ThreadPool.cc
r3230 r3231 28 28 29 29 #include "ThreadPool.h" 30 31 30 #include <cassert> 32 33 31 34 32 namespace orxonox 35 33 { 36 37 34 38 35 ThreadPool::ThreadPool() 39 36 { … … 61 58 } 62 59 } 60 return i; 63 61 } 64 62 unsigned int ThreadPool::setNrOfThreads( unsigned int nr ) -
code/branches/netp6/src/core/ThreadPool.h
r3230 r3231 30 30 #define _ThreadPool_H__ 31 31 32 #include "CorePrereqs.h" 33 32 34 #include <vector> 33 34 35 #include "Thread.h" 35 36 36 37 namespace orxonox 37 38 { 38 39 class ThreadPool 39 class _CoreExport ThreadPool 40 40 { 41 41 public: … … 51 51 52 52 private: 53 std::vector<Thread> 53 std::vector<Thread> threadPool_; 54 54 55 55 }; 56 57 56 } 58 57 59 60 #endif 58 #endif /* _ThreadPool_H__ */ -
code/branches/netp6/src/util/UtilPrereqs.h
r3230 r3231 60 60 // Forward declarations 61 61 //----------------------------------------------------------------------- 62 63 62 namespace Ogre 64 63 {
Note: See TracChangeset
for help on using the changeset viewer.