X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2Fmoof%2Fsocket.hh;h=a7d02f92e8be64000d802c0bae7237e6ff7ec493;hp=c592fdbfb097dd4488d2590a94c8ce267b9aadcf;hb=HEAD;hpb=6b0a0d0efafe34d48ab344fca3b479553bd4e62c

diff --git a/src/moof/socket.hh b/src/moof/socket.hh
index c592fdb..a7d02f9 100644
--- a/src/moof/socket.hh
+++ b/src/moof/socket.hh
@@ -12,11 +12,6 @@
 #ifndef _MOOF_SOCKET_HH_
 #define _MOOF_SOCKET_HH_
 
-/**
- * \file socket.hh
- * Network-related classes, including a reinterpreted sockets API.
- */
-
 #include <algorithm>
 #include <cstring>
 #include <iostream>
@@ -44,7 +39,6 @@
 #include <moof/packet.hh>
 #include <moof/thread.hh>
 
-
 #ifndef AI_ADDRCONFIG
 #define AI_ADDRCONFIG 0
 #endif
@@ -54,6 +48,11 @@
 #endif
 
 
+/**
+ * \file socket.hh
+ * Network-related classes, including a reinterpreted sockets API.
+ */
+
 namespace moof {
 
 
@@ -1002,7 +1001,7 @@ public:
 
 	void socket(moof::socket sock)
 	{
-		mutex::scoped_lock lock(mutex_);
+		MOOF_MUTEX_LOCK(mutex_);
 		socket_ = sock;
 	}
 
@@ -1046,7 +1045,8 @@ private:
 
 	moof::socket			socket_;
 	std::vector<function>	protocols_;
-	mutex					mutex_;
+
+	MOOF_DECLARE_MUTEX(mutex_);
 };