diff options
| author | mydesktop <dev.mc2@gmail.com> | 2014-05-28 21:13:32 -0400 |
|---|---|---|
| committer | mydesktop <dev.mc2@gmail.com> | 2014-05-28 21:13:32 -0400 |
| commit | 5c1b7c72249a114b1c30945fc8a9116c07573a48 (patch) | |
| tree | 5e110e349a1f4dccd33867fecbbc4a2c51fc312d /contrib/epee/include/net/abstract_tcp_server2.inl | |
| parent | raise min fee and correct COIN value (diff) | |
| parent | typo in tx_pool.cpp (diff) | |
| download | monero-5c1b7c72249a114b1c30945fc8a9116c07573a48.tar.xz | |
Merge branch '0.8.8update'
Update to newest version 0.8.8. See change log for details.
Diffstat (limited to 'contrib/epee/include/net/abstract_tcp_server2.inl')
| -rw-r--r-- | contrib/epee/include/net/abstract_tcp_server2.inl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/epee/include/net/abstract_tcp_server2.inl b/contrib/epee/include/net/abstract_tcp_server2.inl index 2a4b10e48..403f5a3bd 100644 --- a/contrib/epee/include/net/abstract_tcp_server2.inl +++ b/contrib/epee/include/net/abstract_tcp_server2.inl @@ -52,11 +52,11 @@ PRAGMA_WARNING_DISABLE_VS(4355) typename t_protocol_handler::config_type& config, volatile uint32_t& sock_count, i_connection_filter* &pfilter) : strand_(io_service), socket_(io_service), - m_protocol_handler(this, config, context), m_want_close_connection(0), m_was_shutdown(0), m_ref_sockets_count(sock_count), - m_pfilter(pfilter) + m_pfilter(pfilter), + m_protocol_handler(this, config, context) { boost::interprocess::ipcdetail::atomic_inc32(&m_ref_sockets_count); } |