To insert to associateive STL containers value_type used instead of make_pair

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
This commit is contained in:
Martin Sustrik 2010-10-14 12:13:52 +02:00
parent f9e6d94be5
commit b7386f5b50
4 changed files with 5 additions and 5 deletions

View File

@ -247,8 +247,8 @@ int zmq::ctx_t::register_endpoint (const char *addr_,
{
endpoints_sync.lock ();
bool inserted = endpoints.insert (std::make_pair (std::string (addr_),
socket_)).second;
bool inserted = endpoints.insert (endpoints_t::value_type (
std::string (addr_), socket_)).second;
if (!inserted) {
errno = EADDRINUSE;
endpoints_sync.unlock ();

View File

@ -179,7 +179,7 @@ void zmq::pgm_receiver_t::in_event ()
// New peer. Add it to the list of know but unjoint peers.
if (it == peers.end ()) {
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.

View File

@ -562,7 +562,7 @@ bool zmq::socket_base_t::register_session (const blob_t &name_,
{
sessions_sync.lock ();
bool registered = sessions.insert (
std::make_pair (name_, session_)).second;
sessions_t::value_type (name_, session_)).second;
sessions_sync.unlock ();
return registered;
}

View File

@ -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?
outpipe_t outpipe = {outpipe_, true};
bool ok = outpipes.insert (std::make_pair (
bool ok = outpipes.insert (outpipes_t::value_type (
peer_identity_, outpipe)).second;
zmq_assert (ok);