Commit 5b36df00 authored by Davis King's avatar Davis King

Merged changes and modified them slightly. In particular, the class already

has a timeout parameter, so the connect() call should use that rather than
adding another.
parents 98910caa e0cabc89
......@@ -553,7 +553,10 @@ namespace dlib
dlib::connection * conn(0);
try
{
conn = dlib::connect(host, port);
if (timeout > 0)
conn = dlib::connect(host, port, timeout);
else
conn = dlib::connect(host, port);
}
catch (const dlib::socket_error& e)
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment