Changeset 1535 for code/trunk/src/core/TclThreadManager.h

Timestamp:

Jun 4, 2008, 8:54:43 PM (16 years ago)

Author:

rgrieder

Message:

merged input branch back to trunk

File:

• code/trunk/src/core/TclThreadManager.h (modified) (3 diffs)

code/trunk/src/core/TclThreadManager.h

@@ -30 +30 @@
 #define _TclThreadManager_H__
 
+#include "CorePrereqs.h"
+
 #include <queue>
 #include <map>
@@ -38 +40 @@
 #include <boost/thread/thread.hpp>
 
-#include "CorePrereqs.h"
-#include "Tickable.h"
 #include "cpptcl/CppTcl.h"
+#include "core/OrxonoxClass.h"
 
 namespace orxonox
@@ -68 +69 @@
     };
 
-    class _CoreExport TclThreadManager : public Tickable
+    class _CoreExport TclThreadManager : public OrxonoxClass
     {
         public: