From a98baef5e4fedca36c8c8755ad7c8233469f6a3f Mon Sep 17 00:00:00 2001 From: Loïc Blot Date: Sun, 4 Jun 2017 21:00:04 +0200 Subject: C++11 patchset 2: remove util/cpp11.h and util/cpp11_container.h (#5821) --- src/network/clientpackethandler.cpp | 4 ++-- src/network/serverpackethandler.cpp | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'src/network') diff --git a/src/network/clientpackethandler.cpp b/src/network/clientpackethandler.cpp index 59669fe6d..d002ae10d 100644 --- a/src/network/clientpackethandler.cpp +++ b/src/network/clientpackethandler.cpp @@ -818,7 +818,7 @@ void Client::handleCommand_StopSound(NetworkPacket* pkt) *pkt >> server_id; - UNORDERED_MAP::iterator i = m_sounds_server_to_client.find(server_id); + std::unordered_map::iterator i = m_sounds_server_to_client.find(server_id); if (i != m_sounds_server_to_client.end()) { int client_id = i->second; m_sound->stopSound(client_id); @@ -833,7 +833,7 @@ void Client::handleCommand_FadeSound(NetworkPacket *pkt) *pkt >> sound_id >> step >> gain; - UNORDERED_MAP::iterator i = + std::unordered_map::const_iterator i = m_sounds_server_to_client.find(sound_id); if (i != m_sounds_server_to_client.end()) diff --git a/src/network/serverpackethandler.cpp b/src/network/serverpackethandler.cpp index 5b026bbdb..098c6e11e 100644 --- a/src/network/serverpackethandler.cpp +++ b/src/network/serverpackethandler.cpp @@ -1695,7 +1695,8 @@ void Server::handleCommand_RemovedSounds(NetworkPacket* pkt) *pkt >> id; - UNORDERED_MAP::iterator i = m_playing_sounds.find(id); + std::unordered_map::iterator i = + m_playing_sounds.find(id); if (i == m_playing_sounds.end()) continue; -- cgit v1.2.3