{
Lock lock(mSocketsMutex);
peerID = getNextPeerID();
- mNewSockets.emplace(peerID, std::move(socketPtr));
+ SocketInfo socketInfo(peerID, std::move(socketPtr));
+ mNewSockets.push(std::move(socketInfo));
}
LOGI("New peer added. Id: " << peerID);
mEventQueue.send(Event::NEW_PEER);
return false;
}
- mSockets.emplace(socketInfo.peerID, std::move(socketInfo.socketPtr));
+ mSockets[socketInfo.peerID] = std::move(socketInfo.socketPtr);
}
resetPolling();
if (mNewPeerCallback) {
if (mReturnCallbacks.count(messageID) != 0) {
LOGE("There already was a return callback for messageID: " << messageID);
}
- mReturnCallbacks.emplace(messageID, ReturnCallbacks(call.peerID,
- std::move(call.parse),
- std::move(call.process)));
+
+ // move insertion
+ mReturnCallbacks[messageID] = std::move(ReturnCallbacks(call.peerID,
+ std::move(call.parse),
+ std::move(call.process)));
}
try {