Changeset 3230 for code/branches

Timestamp:

Jun 23, 2009, 9:45:35 PM (16 years ago)

Author:

scheusso

Message:

moved Thread and ThreadPool to core because of linking issues

Location:

code/branches/netp6/src

Files:

• core/CMakeLists.txt (modified) (1 diff)
• core/CorePrereqs.h (modified) (2 diffs)
• core/Thread.cc (moved) (moved from code/branches/netp6/src/util/Thread.cc)
• core/Thread.h (moved) (moved from code/branches/netp6/src/util/Thread.h) (1 diff)
• core/ThreadPool.cc (moved) (moved from code/branches/netp6/src/util/ThreadPool.cc)
• core/ThreadPool.h (moved) (moved from code/branches/netp6/src/util/ThreadPool.h) (1 diff)
• util/CMakeLists.txt (modified) (1 diff)
• util/UtilPrereqs.h (modified) (2 diffs)

code/branches/netp6/src/core/CMakeLists.txt

@@ -61 +61 @@
   TclBind.cc
   TclThreadManager.cc
+  
+  # multithreading
+  Thread.cc
+  ThreadPool.cc
 )
 ADD_SUBDIRECTORY(input)

code/branches/netp6/src/core/CorePrereqs.h

@@ -186 +186 @@
     class SimpleCommand;
     class SimpleInputState;
+
+    // multithreading
+    class Thread;
+    class ThreadGroup;
 }
 
@@ -196 +200 @@
 
 // Boost
-namespace boost { namespace filesystem
-{
-    struct path_traits;
-    template <class String, class Traits> class basic_path;
-    typedef basic_path<std::string, path_traits> path;
-} }
+namespace boost { 
+    namespace filesystem
+    {
+        struct path_traits;
+        template <class String, class Traits> class basic_path;
+        typedef basic_path<std::string, path_traits> path;
+    } 
+    class thread;
+    class mutex;
+}
 
 // TinyXML and TinyXML++

code/branches/netp6/src/core/Thread.h

@@ -31 +31 @@
 
 
-#include "UtilPrereqs.h"
-#include "core/CorePrereqs.h"
+#include "CorePrereqs.h"
 
  namespace orxonox

code/branches/netp6/src/core/ThreadPool.h

@@ -32 +32 @@
 #include <vector>
 
-#include "UtilPrereqs.h"
 #include "Thread.h"
 

code/branches/netp6/src/util/CMakeLists.txt

@@ -31 +31 @@
   String.cc
   SubString.cc
-  Thread.cc
-  ThreadPool.cc
 )
 

code/branches/netp6/src/util/UtilPrereqs.h

@@ -60 +60 @@
 // Forward declarations
 //-----------------------------------------------------------------------
-namespace boost
-{
-    class thread;
-    class mutex;
-}
 
 namespace Ogre
@@ -101 +96 @@
     class SignalHandler;
     class SubString;
-    class Thread;
-    class ThreadPool;
 }