diff options
| author | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-06-04 21:00:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-04 21:00:04 +0200 |
| commit | a98baef5e4fedca36c8c8755ad7c8233469f6a3f (patch) | |
| tree | c40d1468774cf988b4567f33e89875e0c43803a7 /src/clientiface.h | |
| parent | 2362d3f926e2702585f60011d4cea90b4faf4bd6 (diff) | |
| download | minetest-a98baef5e4fedca36c8c8755ad7c8233469f6a3f.tar.gz minetest-a98baef5e4fedca36c8c8755ad7c8233469f6a3f.tar.bz2 minetest-a98baef5e4fedca36c8c8755ad7c8233469f6a3f.zip | |
C++11 patchset 2: remove util/cpp11.h and util/cpp11_container.h (#5821)
Diffstat (limited to 'src/clientiface.h')
| -rw-r--r-- | src/clientiface.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/clientiface.h b/src/clientiface.h index d2299c879..107ed3bf3 100644 --- a/src/clientiface.h +++ b/src/clientiface.h @@ -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 |