diff options
| author | leak <leak@bitmx.net> | 2014-07-14 22:51:13 +0200 |
|---|---|---|
| committer | leak <leak@bitmx.net> | 2014-07-14 22:51:13 +0200 |
| commit | ecde28d1c114a151c9828fff8898def5e74de4e1 (patch) | |
| tree | 71092bc8d42b5eb844dca53fc216f54995de2320 /src/server | |
| parent | fe5d38ae7d54fd3e9a45674718a86d69f95fcafd (diff) | |
Replacing ACE based multi threading with PCQ
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/collision/Management/VMapManager2.cpp | 1 | ||||
| -rw-r--r-- | src/server/shared/Threading/ProducerConsumerQueue.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/server/collision/Management/VMapManager2.cpp b/src/server/collision/Management/VMapManager2.cpp index 00381cb1205..1d267cbd2a5 100644 --- a/src/server/collision/Management/VMapManager2.cpp +++ b/src/server/collision/Management/VMapManager2.cpp @@ -18,7 +18,6 @@ #include <iostream> #include <iomanip> -#include <mutex> #include <string> #include <sstream> #include "VMapManager2.h" diff --git a/src/server/shared/Threading/ProducerConsumerQueue.h b/src/server/shared/Threading/ProducerConsumerQueue.h index 41bff445c2e..3fefd27ba6e 100644 --- a/src/server/shared/Threading/ProducerConsumerQueue.h +++ b/src/server/shared/Threading/ProducerConsumerQueue.h @@ -47,7 +47,7 @@ public: _condition.notify_one(); } - bool Empty() const + bool Empty() { std::lock_guard<std::mutex> lock(_queueLock); |
