Changeset 8327 for code/trunk/src/libraries/core

Timestamp:

Apr 25, 2011, 8:22:36 PM (14 years ago)

Author:

scheusso

Message:

merging network6 into trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/libraries/core/Thread.cc (modified) (4 diffs)
• src/libraries/core/ThreadWin.cc (copied) (copied from code/branches/network6/src/libraries/core/ThreadWin.cc)

code/trunk/src/libraries/core/Thread.cc

@@ -26 +26 @@
  *
  */
+
+#if defined(ORXONOX_PLATFORM_WINDOWS)
+  #include "ThreadWin.cc"
+#elif defined(ORXONOX_PLATFORM_UNIX)
+
 
 #include "Thread.h"
@@ -91 +96 @@
         while( !stopThread )
         {
-            //this->executorMutex_->lock();
+            this->executorMutex_->lock();
             ExecutorPtr executor = this->executor_;
-            //this->executorMutex_->unlock();
+            this->executorMutex_->unlock();
             if( executor )
             {
@@ -108 +113 @@
                 this->workerThread_->yield();
             }
-            //this->stopThreadMutex_->lock();
+            this->stopThreadMutex_->lock();
             stopThread = this->stopThread_;
-            //this->stopThreadMutex_->unlock();
+            this->stopThreadMutex_->unlock();
         }
     }
@@ -127 +132 @@
     }
 }
+
+#endif