X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fcore%2Fmutex.h;h=6582074e182c988c3d813671b3cb92668c27ceeb;hp=71fbdf0c6e5796423274049dc28a05dfba42cbb2;hb=HEAD;hpb=1a563cfd722a5571428562259790b4948980dd4f

diff --git a/source/core/mutex.h b/source/core/mutex.h
index 71fbdf0..a48f58c 100644
--- a/source/core/mutex.h
+++ b/source/core/mutex.h
@@ -1,6 +1,8 @@
 #ifndef MSP_CORE_MUTEX_H_
 #define MSP_CORE_MUTEX_H_
 
+#include "mspcore_api.h"
+#include "noncopyable.h"
 #include "refptr.h"
 
 namespace Msp {
@@ -9,17 +11,15 @@ namespace Msp {
 A class for controlling mutually exclusive access to a resource.  Only one
 thread can hold a lock on the mutex at a time.
 */
-class Mutex
+class MSPCORE_API Mutex: private NonCopyable
 {
 	friend class Semaphore;
 
 private:
 	struct Private;
 
-	Private *priv;
+	Private *priv = nullptr;
 
-	Mutex(const Mutex &);
-	Mutex &operator=(const Mutex &);
 public:
 	Mutex();
 	~Mutex();
@@ -39,7 +39,7 @@ public:
 /**
 Locks the mutex for the lifetime of the object.
 */
-class MutexLock
+class MSPCORE_API MutexLock
 {
 private:
 	Mutex &mutex;
@@ -68,7 +68,7 @@ public:
 
 	T &operator*() const { return *data; }
 	T *operator->() const { return data; }
-	void clear() { mutex = 0; data = 0; }
+	void clear() { mutex = nullptr; data = nullptr; }
 };
 
 }