diff --git a/src/ipc_connecter.cpp b/src/ipc_connecter.cpp index 85a93181..99fafef7 100644 --- a/src/ipc_connecter.cpp +++ b/src/ipc_connecter.cpp @@ -62,13 +62,6 @@ zmq::ipc_connecter_t::ipc_connecter_t (class io_thread_t *io_thread_, zmq_assert (_addr->protocol == protocol_name::ipc); } -zmq::ipc_connecter_t::~ipc_connecter_t () -{ - zmq_assert (!_reconnect_timer_started); - zmq_assert (_handle == static_cast (NULL)); - zmq_assert (_s == retired_fd); -} - void zmq::ipc_connecter_t::process_plug () { if (_delayed_start) diff --git a/src/ipc_connecter.hpp b/src/ipc_connecter.hpp index b454f548..5f975bd7 100644 --- a/src/ipc_connecter.hpp +++ b/src/ipc_connecter.hpp @@ -48,7 +48,6 @@ class ipc_connecter_t : public stream_connecter_base_t const options_t &options_, address_t *addr_, bool delayed_start_); - ~ipc_connecter_t (); private: // ID of the timer used to delay the reconnection. diff --git a/src/stream_connecter_base.cpp b/src/stream_connecter_base.cpp index f6a20c20..525ba89b 100644 --- a/src/stream_connecter_base.cpp +++ b/src/stream_connecter_base.cpp @@ -55,3 +55,10 @@ zmq::stream_connecter_base_t::stream_connecter_base_t ( // or does not matter, change such that endpoint in initialized using an // initializer, and make endpoint const } + +zmq::stream_connecter_base_t::~stream_connecter_base_t () +{ + zmq_assert (!_reconnect_timer_started); + zmq_assert (!_handle); + zmq_assert (_s == retired_fd); +} diff --git a/src/stream_connecter_base.hpp b/src/stream_connecter_base.hpp index d97e5b38..9de99b90 100644 --- a/src/stream_connecter_base.hpp +++ b/src/stream_connecter_base.hpp @@ -51,6 +51,9 @@ class stream_connecter_base_t : public own_t, public io_object_t address_t *addr_, bool delayed_start_); + ~stream_connecter_base_t (); + + protected: // Address to connect to. Owned by session_base_t. // It is non-const since some parts may change during opening. diff --git a/src/tcp_connecter.cpp b/src/tcp_connecter.cpp index f65fcf96..029ecf5b 100644 --- a/src/tcp_connecter.cpp +++ b/src/tcp_connecter.cpp @@ -79,9 +79,6 @@ zmq::tcp_connecter_t::tcp_connecter_t (class io_thread_t *io_thread_, zmq::tcp_connecter_t::~tcp_connecter_t () { zmq_assert (!_connect_timer_started); - zmq_assert (!_reconnect_timer_started); - zmq_assert (!_handle); - zmq_assert (_s == retired_fd); } void zmq::tcp_connecter_t::process_plug () diff --git a/src/tipc_connecter.cpp b/src/tipc_connecter.cpp index 764e9336..0f20a878 100644 --- a/src/tipc_connecter.cpp +++ b/src/tipc_connecter.cpp @@ -64,13 +64,6 @@ zmq::tipc_connecter_t::tipc_connecter_t (class io_thread_t *io_thread_, zmq_assert (_addr->protocol == "tipc"); } -zmq::tipc_connecter_t::~tipc_connecter_t () -{ - zmq_assert (!_reconnect_timer_started); - zmq_assert (_handle == static_cast (NULL)); - zmq_assert (_s == retired_fd); -} - void zmq::tipc_connecter_t::process_plug () { if (_delayed_start) diff --git a/src/tipc_connecter.hpp b/src/tipc_connecter.hpp index cf150629..bff14193 100644 --- a/src/tipc_connecter.hpp +++ b/src/tipc_connecter.hpp @@ -49,7 +49,6 @@ class tipc_connecter_t : public stream_connecter_base_t const options_t &options_, address_t *addr_, bool delayed_start_); - ~tipc_connecter_t (); private: // ID of the timer used to delay the reconnection.