Changeset 10577 in orxonox.OLD for branches/cleanup/src/lib/util

Timestamp:

Feb 7, 2007, 9:31:36 PM (18 years ago)

Author:

bensch

Message:

better incls

Location:

branches/cleanup/src/lib/util

Files:

• debug_buffer.cc (modified) (2 diffs)
• filesys/net_link.cc (modified) (3 diffs)
• filesys/net_link.h (modified) (1 diff)
• threads/mutex_locker.h (modified) (1 diff)

branches/cleanup/src/lib/util/debug_buffer.cc

@@ -20 +20 @@
 #include "debug.h"
 #include "compiler.h"
-#include "threads/threading.h"
+#include "threads/mutex_locker.h"
 
 /**
@@ -64 +64 @@
   static OrxThread::Mutex DebugBuffer__bufferMutex;
 
-  OrxThread::MutexLock bufferLock(&DebugBuffer__bufferMutex);
+  OrxThread::MutexLocker bufferLock(&DebugBuffer__bufferMutex);
 
   va_list arguments;

branches/cleanup/src/lib/util/filesys/net_link.cc

@@ -17 +17 @@
 #include "debug.h"
 
+#include "threads/mutex_locker.h"
 
 #ifdef __OSX__
@@ -45 +46 @@
 int NetLink::openupInBrowser(void* url)
 {
-  OrxThread::MutexLock lock(&NetLink::_mutex);
+  OrxThread::MutexLocker lock(&NetLink::_mutex);
 
   std::string URL = *(std::string*)url;
@@ -69 +70 @@
 void NetLink::setDefaultBrowser(const std::string& browserName)
 {
-  OrxThread::MutexLock lock(&NetLink::_mutex);
+  OrxThread::MutexLocker lock(&NetLink::_mutex);
   NetLink::_defaultBrowser = browserName;
 }

branches/cleanup/src/lib/util/filesys/net_link.h

@@ -19 +19 @@
 #include <list>
 
-#include "threads/threading.h"
+#include "threads/mutex.h"
 
 //! NetLink is a File and Link executer for Internet Links

branches/cleanup/src/lib/util/threads/mutex_locker.h

@@ -8 +8 @@
 
   //! A Class that locks a Mutex within its scope
-  class MutexLock
+  class MutexLocker
   {
   public:
     //! Locks the Mutex mutex in this Scope.
-    MutexLock(Mutex* mutex) { SDL_mutexP(mutex->getMutex()); this->mutex = mutex; };
-    ~MutexLock() { SDL_mutexV(mutex->getMutex()); };
+    MutexLocker(Mutex* mutex) { SDL_mutexP(mutex->getMutex()); this->mutex = mutex; };
+    ~MutexLocker() { SDL_mutexV(mutex->getMutex()); };
   private:
     Mutex* mutex;         //!< The Mutex to lock.