diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-06-26 23:36:24 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-06-26 23:36:24 +0100 |
| commit | 4616b19fb5241a54c9d57f7a91bb975f41aed14b (patch) | |
| tree | d067450cb12dd3629fe88ef9a578c6b1cabe7884 /src/lib/server.h | |
| parent | f1d30fb114b3b2c6ccd8fdf5823e7cd6b26c1eef (diff) | |
| parent | 20fa26ea6ecfdbecea8bb1230c8388cce3fd521f (diff) | |
Merge master.
Diffstat (limited to 'src/lib/server.h')
| -rw-r--r-- | src/lib/server.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/server.h b/src/lib/server.h index 9f3e99f9c..b340bba07 100644 --- a/src/lib/server.h +++ b/src/lib/server.h @@ -107,8 +107,8 @@ private: std::vector<boost::thread *> _worker_threads; std::list<boost::shared_ptr<Socket> > _queue; boost::mutex _worker_mutex; - boost::condition _worker_condition; - + boost::condition _full_condition; + boost::condition _empty_condition; boost::shared_ptr<Log> _log; bool _verbose; |