summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMartin Sustrik <sustrik@250bpm.com>2011-01-18 15:57:45 +0100
committerMartin Sustrik <sustrik@250bpm.com>2011-01-18 15:57:45 +0100
commit56bdba592cf336b2bd4241a2b8e331cd38a089e4 (patch)
tree3daf5193834a45b4dd94e874f7d7ee5c4b47c6dc /src
parentb262f2fe9ba02a6d2749e286eaadc65d489600c9 (diff)
Fix cppcheck warnings: Prefer prefix ++/-- operators for non-primitive types.
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
Diffstat (limited to 'src')
-rw-r--r--src/ctx.cpp6
-rw-r--r--src/epoll.cpp4
-rw-r--r--src/kqueue.cpp2
-rw-r--r--src/own.cpp2
-rw-r--r--src/pgm_receiver.cpp2
-rw-r--r--src/poller_base.cpp2
-rw-r--r--src/select.cpp4
-rw-r--r--src/xrep.cpp8
8 files changed, 15 insertions, 15 deletions
diff --git a/src/ctx.cpp b/src/ctx.cpp
index 3849497..858d91e 100644
--- a/src/ctx.cpp
+++ b/src/ctx.cpp
@@ -266,11 +266,11 @@ void zmq::ctx_t::unregister_endpoints (socket_base_t *socket_)
while (it != endpoints.end ()) {
if (it->second.socket == socket_) {
endpoints_t::iterator to_erase = it;
- it++;
+ ++it;
endpoints.erase (to_erase);
continue;
}
- it++;
+ ++it;
}
endpoints_sync.unlock ();
@@ -327,7 +327,7 @@ void zmq::ctx_t::dezombify ()
slots [tid] = NULL;
}
else
- it++;
+ ++it;
}
}
diff --git a/src/epoll.cpp b/src/epoll.cpp
index ccf816b..ae39407 100644
--- a/src/epoll.cpp
+++ b/src/epoll.cpp
@@ -46,7 +46,7 @@ zmq::epoll_t::~epoll_t ()
worker.stop ();
close (epoll_fd);
- for (retired_t::iterator it = retired.begin (); it != retired.end (); it ++)
+ for (retired_t::iterator it = retired.begin (); it != retired.end (); ++it)
delete *it;
}
@@ -162,7 +162,7 @@ void zmq::epoll_t::loop ()
// Destroy retired event sources.
for (retired_t::iterator it = retired.begin (); it != retired.end ();
- it ++)
+ ++it)
delete *it;
retired.clear ();
}
diff --git a/src/kqueue.cpp b/src/kqueue.cpp
index 9b4dcce..63c1c42 100644
--- a/src/kqueue.cpp
+++ b/src/kqueue.cpp
@@ -177,7 +177,7 @@ void zmq::kqueue_t::loop ()
// Destroy retired event sources.
for (retired_t::iterator it = retired.begin (); it != retired.end ();
- it ++)
+ ++it)
delete *it;
retired.clear ();
}
diff --git a/src/own.cpp b/src/own.cpp
index 15d2567..86759d4 100644
--- a/src/own.cpp
+++ b/src/own.cpp
@@ -158,7 +158,7 @@ void zmq::own_t::process_term (int linger_)
zmq_assert (!terminating);
// Send termination request to all owned objects.
- for (owned_t::iterator it = owned.begin (); it != owned.end (); it++)
+ for (owned_t::iterator it = owned.begin (); it != owned.end (); ++it)
send_term (*it, linger_);
register_term_acks (owned.size ());
owned.clear ();
diff --git a/src/pgm_receiver.cpp b/src/pgm_receiver.cpp
index 88ac698..f0b2601 100644
--- a/src/pgm_receiver.cpp
+++ b/src/pgm_receiver.cpp
@@ -73,7 +73,7 @@ void zmq::pgm_receiver_t::plug (io_thread_t *io_thread_, i_inout *inout_)
void zmq::pgm_receiver_t::unplug ()
{
// Delete decoders.
- for (peers_t::iterator it = peers.begin (); it != peers.end (); it++) {
+ for (peers_t::iterator it = peers.begin (); it != peers.end (); ++it) {
if (it->second.decoder != NULL)
delete it->second.decoder;
}
diff --git a/src/poller_base.cpp b/src/poller_base.cpp
index 89e25fd..65750e9 100644
--- a/src/poller_base.cpp
+++ b/src/poller_base.cpp
@@ -54,7 +54,7 @@ void zmq::poller_base_t::add_timer (int timeout_, i_poll_events *sink_, int id_)
void zmq::poller_base_t::cancel_timer (i_poll_events *sink_, int id_)
{
// Complexity of this operation is O(n). We assume it is rarely used.
- for (timers_t::iterator it = timers.begin (); it != timers.end (); it++)
+ for (timers_t::iterator it = timers.begin (); it != timers.end (); ++it)
if (it->second.sink == sink_ && it->second.id == id_) {
timers.erase (it);
return;
diff --git a/src/select.cpp b/src/select.cpp
index 78d3afd..074515e 100644
--- a/src/select.cpp
+++ b/src/select.cpp
@@ -83,7 +83,7 @@ void zmq::select_t::rm_fd (handle_t handle_)
{
// Mark the descriptor as retired.
fd_set_t::iterator it;
- for (it = fds.begin (); it != fds.end (); it ++)
+ for (it = fds.begin (); it != fds.end (); ++it)
if (it->fd == handle_)
break;
zmq_assert (it != fds.end ());
@@ -104,7 +104,7 @@ void zmq::select_t::rm_fd (handle_t handle_)
// highest-numbered file descriptor.
if (handle_ == maxfd) {
maxfd = retired_fd;
- for (fd_set_t::iterator it = fds.begin (); it != fds.end (); it ++)
+ for (fd_set_t::iterator it = fds.begin (); it != fds.end (); ++it)
if (it->fd > maxfd)
maxfd = it->fd;
}
diff --git a/src/xrep.cpp b/src/xrep.cpp
index f6f8090..9c985c0 100644
--- a/src/xrep.cpp
+++ b/src/xrep.cpp
@@ -87,10 +87,10 @@ void zmq::xrep_t::process_term (int linger_)
register_term_acks (inpipes.size () + outpipes.size ());
for (inpipes_t::iterator it = inpipes.begin (); it != inpipes.end ();
- it++)
+ ++it)
it->reader->terminate ();
for (outpipes_t::iterator it = outpipes.begin (); it != outpipes.end ();
- it++)
+ ++it)
it->second.writer->terminate ();
socket_base_t::process_term (linger_);
@@ -99,7 +99,7 @@ void zmq::xrep_t::process_term (int linger_)
void zmq::xrep_t::terminated (reader_t *pipe_)
{
for (inpipes_t::iterator it = inpipes.begin (); it != inpipes.end ();
- it++) {
+ ++it) {
if (it->reader == pipe_) {
inpipes.erase (it);
if (terminating)
@@ -135,7 +135,7 @@ void zmq::xrep_t::delimited (reader_t *pipe_)
void zmq::xrep_t::activated (reader_t *pipe_)
{
for (inpipes_t::iterator it = inpipes.begin (); it != inpipes.end ();
- it++) {
+ ++it) {
if (it->reader == pipe_) {
zmq_assert (!it->active);
it->active = true;