Commit 7a510b4b authored by Richard Newton's avatar Richard Newton

Fix formatting.

parent 90425cd5
...@@ -40,8 +40,8 @@ ...@@ -40,8 +40,8 @@
int clipped_maxsocket(int max_requested) int clipped_maxsocket(int max_requested)
{ {
if (max_requested >= zmq::poller_t::max_fds() && zmq::poller_t::max_fds() != -1) if (max_requested >= zmq::poller_t::max_fds () && zmq::poller_t::max_fds () != -1)
max_requested = zmq::poller_t::max_fds() - 1; // -1 because we need room for the repear mailbox. max_requested = zmq::poller_t::max_fds () - 1; // -1 because we need room for the repear mailbox.
return max_requested; return max_requested;
} }
...@@ -53,7 +53,7 @@ zmq::ctx_t::ctx_t () : ...@@ -53,7 +53,7 @@ zmq::ctx_t::ctx_t () :
reaper (NULL), reaper (NULL),
slot_count (0), slot_count (0),
slots (NULL), slots (NULL),
max_sockets(clipped_maxsocket(ZMQ_MAX_SOCKETS_DFLT)), max_sockets (clipped_maxsocket (ZMQ_MAX_SOCKETS_DFLT)),
io_thread_count (ZMQ_IO_THREADS_DFLT), io_thread_count (ZMQ_IO_THREADS_DFLT),
ipv6 (false) ipv6 (false)
{ {
...@@ -169,7 +169,7 @@ int zmq::ctx_t::shutdown () ...@@ -169,7 +169,7 @@ int zmq::ctx_t::shutdown ()
int zmq::ctx_t::set (int option_, int optval_) int zmq::ctx_t::set (int option_, int optval_)
{ {
int rc = 0; int rc = 0;
if (option_ == ZMQ_MAX_SOCKETS && optval_ >= 1 && optval_ == clipped_maxsocket(optval_)) { if (option_ == ZMQ_MAX_SOCKETS && optval_ >= 1 && optval_ == clipped_maxsocket (optval_)) {
opt_sync.lock (); opt_sync.lock ();
max_sockets = optval_; max_sockets = optval_;
opt_sync.unlock (); opt_sync.unlock ();
......
...@@ -133,7 +133,7 @@ void zmq::devpoll_t::stop () ...@@ -133,7 +133,7 @@ void zmq::devpoll_t::stop ()
stopping = true; stopping = true;
} }
int zmq::devpoll_t::max_fds() int zmq::devpoll_t::max_fds ()
{ {
return -1; return -1;
} }
......
...@@ -56,7 +56,7 @@ namespace zmq ...@@ -56,7 +56,7 @@ namespace zmq
void start (); void start ();
void stop (); void stop ();
static int max_fds(); static int max_fds ();
private: private:
......
...@@ -126,7 +126,7 @@ void zmq::epoll_t::stop () ...@@ -126,7 +126,7 @@ void zmq::epoll_t::stop ()
stopping = true; stopping = true;
} }
int zmq::epoll_t::max_fds() int zmq::epoll_t::max_fds ()
{ {
return -1; return -1;
} }
......
...@@ -58,7 +58,7 @@ namespace zmq ...@@ -58,7 +58,7 @@ namespace zmq
void start (); void start ();
void stop (); void stop ();
static int max_fds(); static int max_fds ();
private: private:
......
...@@ -152,7 +152,7 @@ void zmq::kqueue_t::stop () ...@@ -152,7 +152,7 @@ void zmq::kqueue_t::stop ()
stopping = true; stopping = true;
} }
int zmq::kqueue_t::max_fds() int zmq::kqueue_t::max_fds ()
{ {
return -1; return -1;
} }
......
...@@ -58,7 +58,7 @@ namespace zmq ...@@ -58,7 +58,7 @@ namespace zmq
void start (); void start ();
void stop (); void stop ();
static int max_fds(); static int max_fds ();
private: private:
......
...@@ -114,7 +114,7 @@ void zmq::poll_t::stop () ...@@ -114,7 +114,7 @@ void zmq::poll_t::stop ()
stopping = true; stopping = true;
} }
int zmq::poll_t::max_fds() int zmq::poll_t::max_fds ()
{ {
return -1; return -1;
} }
......
...@@ -59,7 +59,7 @@ namespace zmq ...@@ -59,7 +59,7 @@ namespace zmq
void start (); void start ();
void stop (); void stop ();
static int max_fds(); static int max_fds ();
private: private:
......
...@@ -144,7 +144,7 @@ void zmq::select_t::stop () ...@@ -144,7 +144,7 @@ void zmq::select_t::stop ()
stopping = true; stopping = true;
} }
int zmq::select_t::max_fds() int zmq::select_t::max_fds ()
{ {
return FD_SETSIZE; return FD_SETSIZE;
} }
......
...@@ -69,7 +69,7 @@ namespace zmq ...@@ -69,7 +69,7 @@ namespace zmq
void start (); void start ();
void stop (); void stop ();
static int max_fds(); static int max_fds ();
private: private:
......
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