oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

C++11 patchset 2: remove util/cpp11.h and util/cpp11_container.h (#5821)

Browse source
This commit is contained in:
Loïc Blot 2017-06-04 21:00:04 +02:00 • committed by GitHub
parent 2362d3f926
commit a98baef5e4
59 changed files with 223 additions and 298 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/clientiface.h
View file

@ -25,7 +25,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "serialization.h" // for SER_FMT_VER_INVALID
#include "threading/mutex.h"
#include "network/networkpacket.h"
#include "util/cpp11_container.h"
#include "porting.h"
#include <list>
@ -435,6 +434,8 @@ private:
const u64 m_connection_time;
};
typedef std::unordered_map<u16, RemoteClient*> RemoteClientMap;
class ClientInterface {
public:
@ -499,7 +500,7 @@ protected:
void lock() { m_clients_mutex.lock(); }
void unlock() { m_clients_mutex.unlock(); }
UNORDERED_MAP<u16, RemoteClient*>& getClientList() { return m_clients; }
RemoteClientMap& getClientList() { return m_clients; }
private:
/* update internal player list */
@ -509,7 +510,7 @@ private:
con::Connection* m_con;
Mutex m_clients_mutex;
// Connected clients (behind the con mutex)
UNORDERED_MAP<u16, RemoteClient*> m_clients;
RemoteClientMap m_clients;
std::vector<std::string> m_clients_names; //for announcing masterserver
// Environment