Add move semantics to Variant

[libs/core.git] / source / core / semaphore.h

diff --git a/source/core/semaphore.h b/source/core/semaphore.h
index e6c09c54437e57ed3ae0cf8903a30c920c976760..f5042892a1825bf1650f16e8ad93f833790f90a3 100644 (file)
--- a/source/core/semaphore.h
+++ b/source/core/semaphore.h
@@ -1,55 +1,28 @@
-/* $Id$
-
-This file is part of libmspcore
-Copyright © 2006  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_CORE_SEMAPHORE_H_
 #define MSP_CORE_SEMAPHORE_H_
 
-#include "mutex.h"
-#include "types.h"
-#include "../time/timedelta.h"
+#include <msp/time/timedelta.h>
+#include "mspcore_api.h"
+#include "noncopyable.h"
 
 namespace Msp {
 
-class Semaphore
+class MSPCORE_API Semaphore: private NonCopyable
 {
 private:
-       Mutex *mutex;
-       bool  own_mutex;
-       SemaphoreHandle sem;
-#ifdef WIN32
-       unsigned count;
-#endif
+       struct Private;
+
+       Private *priv = nullptr;
 
 public:
-       Semaphore();
-       Semaphore(Mutex &);
-private:
-       void init();
-public:
+       Semaphore(unsigned);
        ~Semaphore();
 
-       int   signal();
-       int   broadcast();
-       int   wait();
-       int   wait(const Time::TimeDelta &);
-       Mutex &get_mutex() { return *mutex; }
+       void signal();
+       void wait();
+       bool wait(const Time::TimeDelta &);
 };
 
-#ifndef WIN32
-inline int Semaphore::signal()
-{ return pthread_cond_signal(&sem); }
-
-inline int Semaphore::broadcast()
-{ return pthread_cond_broadcast(&sem); }
-
-inline int Semaphore::wait()
-{ return pthread_cond_wait(&sem, &mutex->mutex); }
-#endif
-
 }
 
 #endif