diff options
author | Matthias Schiffer <matthias@gamezock.de> | 2009-05-17 01:34:10 +0200 |
---|---|---|
committer | Matthias Schiffer <matthias@gamezock.de> | 2009-05-17 01:34:10 +0200 |
commit | a3e566c4d3631076e29f3651554603184b6351a7 (patch) | |
tree | 71effee59fd4364174f7a845204f946dbc18ff2a /src/Net/ServerConnection.cpp | |
parent | c8d469cc3de8ef2fb95f7b47355ebf5318a4c22f (diff) | |
download | mad-a3e566c4d3631076e29f3651554603184b6351a7.tar mad-a3e566c4d3631076e29f3651554603184b6351a7.zip |
Gnulib durch boost ersetzt
Diffstat (limited to 'src/Net/ServerConnection.cpp')
-rw-r--r-- | src/Net/ServerConnection.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/Net/ServerConnection.cpp b/src/Net/ServerConnection.cpp index aa8042e..c415cb3 100644 --- a/src/Net/ServerConnection.cpp +++ b/src/Net/ServerConnection.cpp @@ -21,6 +21,8 @@ #include "FdManager.h" #include "IPAddress.h" +#include <boost/thread/locks.hpp> + #include <cstring> #include <cerrno> #include <sys/socket.h> @@ -61,7 +63,7 @@ void ServerConnection::connectionHeaderReceiveHandler(const void *data, unsigned ServerConnection::ServerConnection(int sock0, const IPAddress &address, gnutls_dh_params_t dh_params, const std::string &x905CertFile, const std::string &x905KeyFile) : daemon(false) { - gl_rwlock_wrlock(stateLock); + boost::unique_lock<boost::shared_mutex> lock(stateLock); sock = sock0; @@ -79,7 +81,7 @@ ServerConnection::ServerConnection(int sock0, const IPAddress &address, gnutls_d state = CONNECT; - gl_rwlock_unlock(stateLock); + lock.unlock(); updateEvents(); } |