From: Danny Al-Gaaf Date: Fri, 15 Mar 2013 09:08:24 +0000 (+0100) Subject: msg/Pipe.cc: prefer prefix ++operator for iterators X-Git-Tag: v0.60~45^2~24 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9704dde12167ee49fc590a2fb2b9467b7e3b896a;p=ceph.git msg/Pipe.cc: prefer prefix ++operator for iterators Signed-off-by: Danny Al-Gaaf --- diff --git a/src/msg/Pipe.cc b/src/msg/Pipe.cc index ad1fec007c72..1420b63beb80 100644 --- a/src/msg/Pipe.cc +++ b/src/msg/Pipe.cc @@ -588,7 +588,7 @@ int Pipe::accept() ldout(msgr->cct,10) << "accept re-queuing on out_seq " << out_seq << " in_seq " << in_seq << dendl; for (map >::iterator p = existing->out_q.begin(); p != existing->out_q.end(); - p++) + ++p) out_q[p->first].splice(out_q[p->first].begin(), p->second); } existing->pipe_lock.Unlock(); @@ -1127,13 +1127,13 @@ void Pipe::discard_out_queue() { ldout(msgr->cct,10) << "discard_queue" << dendl; - for (list::iterator p = sent.begin(); p != sent.end(); p++) { + for (list::iterator p = sent.begin(); p != sent.end(); ++p) { ldout(msgr->cct,20) << " discard " << *p << dendl; (*p)->put(); } sent.clear(); - for (map >::iterator p = out_q.begin(); p != out_q.end(); p++) - for (list::iterator r = p->second.begin(); r != p->second.end(); r++) { + for (map >::iterator p = out_q.begin(); p != out_q.end(); ++p) + for (list::iterator r = p->second.begin(); r != p->second.end(); ++r) { ldout(msgr->cct,20) << " discard " << *r << dendl; (*r)->put(); } @@ -1998,7 +1998,7 @@ int Pipe::write_message(ceph_msg_header& header, ceph_msg_footer& footer, buffer if (left == 0) break; while (b_off == (int)pb->length()) { - pb++; + ++pb; b_off = 0; } }