Context Navigation

core

Timestamp:

Jun 23, 2009, 9:59:04 PM (15 years ago)

Author:

rgrieder

Message:

Build fixes: Classes should export symbols with _CoreExport and functions with return values should return something.

Location:

code/branches/netp6/src/core

Files:

-                      r3230
+                      r3231
 // Boost
+namespace boost {
+namespace boost
+{
     namespace filesystem
+    {

-                      r3230
+                      r3231
 #include <boost/thread/thread_time.hpp>
-#include "core/Functor.h"
 #include "util/Sleep.h"
+#include "Functor.h"
 namespace orxonox

-                      r3230
+                      r3231
 #define _Thread_H__
 #include "CorePrereqs.h"
  namespace orxonox
+{
+    class Thread
+    class _CoreExport Thread
+    {
     public:
         Thread();
         virtual ~Thread();
         inline  bool isWorking(){ return this->isWorking_; }
+        inline bool isWorking() { return this->isWorking_; }
         void waitUntilFinished();
         bool evaluateFunctor( Functor* functor );
     private:
         void            threadLoop();
 …
         boost::mutex*   communicationMutex_;
     };
+}
+ }
 #endif
+#endif /* _Thread_H__ */

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 )

-                      r3230
+                      r3231
 #define _ThreadPool_H__
+#include "CorePrereqs.h"
 #include <vector>
 #include "Thread.h"
  namespace orxonox
+{
+    class ThreadPool
+    class _CoreExport ThreadPool
+    {
     public:
 …
     private:
         std::vector<Thread>     threadPool_;
+        std::vector<Thread> threadPool_;
     };
+}
+#endif
+#endif /* _ThreadPool_H__ */

Note: See TracChangeset for help on using the changeset viewer.