Commit b7386f5b authored by Martin Sustrik's avatar Martin Sustrik

To insert to associateive STL containers value_type used instead of make_pair

Signed-off-by: 's avatarMartin Sustrik <sustrik@250bpm.com>
parent f9e6d94b
...@@ -247,8 +247,8 @@ int zmq::ctx_t::register_endpoint (const char *addr_, ...@@ -247,8 +247,8 @@ int zmq::ctx_t::register_endpoint (const char *addr_,
{ {
endpoints_sync.lock (); endpoints_sync.lock ();
bool inserted = endpoints.insert (std::make_pair (std::string (addr_), bool inserted = endpoints.insert (endpoints_t::value_type (
socket_)).second; std::string (addr_), socket_)).second;
if (!inserted) { if (!inserted) {
errno = EADDRINUSE; errno = EADDRINUSE;
endpoints_sync.unlock (); endpoints_sync.unlock ();
......
...@@ -179,7 +179,7 @@ void zmq::pgm_receiver_t::in_event () ...@@ -179,7 +179,7 @@ void zmq::pgm_receiver_t::in_event ()
// New peer. Add it to the list of know but unjoint peers. // New peer. Add it to the list of know but unjoint peers.
if (it == peers.end ()) { if (it == peers.end ()) {
peer_info_t peer_info = {false, NULL}; peer_info_t peer_info = {false, NULL};
it = peers.insert (std::make_pair (*tsi, peer_info)).first; it = peers.insert (peers_t::value_type (*tsi, peer_info)).first;
} }
// Read the offset of the fist message in the current packet. // Read the offset of the fist message in the current packet.
......
...@@ -562,7 +562,7 @@ bool zmq::socket_base_t::register_session (const blob_t &name_, ...@@ -562,7 +562,7 @@ bool zmq::socket_base_t::register_session (const blob_t &name_,
{ {
sessions_sync.lock (); sessions_sync.lock ();
bool registered = sessions.insert ( bool registered = sessions.insert (
std::make_pair (name_, session_)).second; sessions_t::value_type (name_, session_)).second;
sessions_sync.unlock (); sessions_sync.unlock ();
return registered; return registered;
} }
......
...@@ -56,7 +56,7 @@ void zmq::xrep_t::xattach_pipes (reader_t *inpipe_, writer_t *outpipe_, ...@@ -56,7 +56,7 @@ void zmq::xrep_t::xattach_pipes (reader_t *inpipe_, writer_t *outpipe_,
// TODO: What if new connection has same peer identity as the old one? // TODO: What if new connection has same peer identity as the old one?
outpipe_t outpipe = {outpipe_, true}; outpipe_t outpipe = {outpipe_, true};
bool ok = outpipes.insert (std::make_pair ( bool ok = outpipes.insert (outpipes_t::value_type (
peer_identity_, outpipe)).second; peer_identity_, outpipe)).second;
zmq_assert (ok); zmq_assert (ok);
......
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