diff --git a/src/ipc_connecter.hpp b/src/ipc_connecter.hpp index ea1edaa9..3209b0c6 100644 --- a/src/ipc_connecter.hpp +++ b/src/ipc_connecter.hpp @@ -50,12 +50,6 @@ class ipc_connecter_t : public stream_connecter_base_t bool delayed_start_); private: - // ID of the timer used to delay the reconnection. - enum - { - reconnect_timer_id = 1 - }; - // Handlers for I/O events. void out_event (); diff --git a/src/stream_connecter_base.hpp b/src/stream_connecter_base.hpp index 960815e0..7c4b4075 100644 --- a/src/stream_connecter_base.hpp +++ b/src/stream_connecter_base.hpp @@ -54,6 +54,12 @@ class stream_connecter_base_t : public own_t, public io_object_t ~stream_connecter_base_t (); private: + // ID of the timer used to delay the reconnection. + enum + { + reconnect_timer_id = 1 + }; + // Internal function to return a reconnect backoff delay. // Will modify the current_reconnect_ivl used for next call // Returns the currently used interval @@ -63,12 +69,6 @@ class stream_connecter_base_t : public own_t, public io_object_t // TODO check if some members can be made private protected: - // ID of the timer used to delay the reconnection. - enum - { - reconnect_timer_id = 1 - }; - // Handlers for incoming commands. void process_plug (); void process_term (int linger_); diff --git a/src/tcp_connecter.cpp b/src/tcp_connecter.cpp index 99e172aa..d823a201 100644 --- a/src/tcp_connecter.cpp +++ b/src/tcp_connecter.cpp @@ -116,7 +116,6 @@ void zmq::tcp_connecter_t::out_event () void zmq::tcp_connecter_t::timer_event (int id_) { - zmq_assert (id_ == reconnect_timer_id || id_ == connect_timer_id); if (id_ == connect_timer_id) { _connect_timer_started = false; rm_handle (); diff --git a/src/tipc_connecter.hpp b/src/tipc_connecter.hpp index 42cd958c..433a8633 100644 --- a/src/tipc_connecter.hpp +++ b/src/tipc_connecter.hpp @@ -51,12 +51,6 @@ class tipc_connecter_t : public stream_connecter_base_t bool delayed_start_); private: - // ID of the timer used to delay the reconnection. - enum - { - reconnect_timer_id = 1 - }; - // Handlers for I/O events. void out_event ();