Merge pull request #1145 from pijyoi/master

use enum retired_fd instead of -1
This commit is contained in:
Pieter Hintjens 2014-07-28 22:29:09 +02:00
commit 10a2e6c24d

View File

@ -87,7 +87,7 @@ void zmq::socks_connecter_t::process_term (int linger_)
case sending_request:
case waiting_for_response:
rm_fd (handle);
if (s != -1)
if (s != retired_fd)
close ();
break;
}
@ -227,7 +227,7 @@ void zmq::socks_connecter_t::initiate_connect ()
}
// Handle any other error condition by eventual reconnect.
else {
if (s != -1)
if (s != retired_fd)
close ();
start_timer ();
}