diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-03-11 20:15:10 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-03-11 20:15:10 +0200 |
| commit | dfd0e9c97d80c5cd7115d6cbb49cce08168071b6 (patch) | |
| tree | 7bb5c56c18c83f3180101e310198cb3e3fdf1ab7 /contrib/epee/include/net/abstract_tcp_server2.h | |
| parent | Merge pull request #711 (diff) | |
| parent | Need to link boost::chrono in more places now (diff) | |
| download | monero-dfd0e9c97d80c5cd7115d6cbb49cce08168071b6.tar.xz | |
Merge pull request #712
66c2fc7 Need to link boost::chrono in more places now (Howard Chu)
b937a2c Use boost::thread instead of std::thread (Howard Chu)
Diffstat (limited to 'contrib/epee/include/net/abstract_tcp_server2.h')
| -rw-r--r-- | contrib/epee/include/net/abstract_tcp_server2.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/epee/include/net/abstract_tcp_server2.h b/contrib/epee/include/net/abstract_tcp_server2.h index f3dd7291c..80f3f6db0 100644 --- a/contrib/epee/include/net/abstract_tcp_server2.h +++ b/contrib/epee/include/net/abstract_tcp_server2.h @@ -153,8 +153,8 @@ namespace net_utils // for calculate speed (last 60 sec) network_throttle m_throttle_speed_in; network_throttle m_throttle_speed_out; - std::mutex m_throttle_speed_in_mutex; - std::mutex m_throttle_speed_out_mutex; + boost::mutex m_throttle_speed_in_mutex; + boost::mutex m_throttle_speed_out_mutex; public: void setRpcStation(); @@ -307,7 +307,7 @@ namespace net_utils /// The next connection to be accepted connection_ptr new_connection_; - std::mutex connections_mutex; + boost::mutex connections_mutex; std::deque<std::pair<boost::system_time, connection_ptr>> connections_; }; // class <>boosted_tcp_server |