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/clientmedia.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/clientmedia.h')
| -rw-r--r-- | src/clientmedia.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/clientmedia.h b/src/clientmedia.h index 3c96dfe8a..4c0c3c888 100644 --- a/src/clientmedia.h +++ b/src/clientmedia.h @@ -26,7 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include <map> #include <set> #include <vector> -#include "util/cpp11_container.h" +#include <unordered_map> class Client; struct HTTPFetchResult; @@ -138,7 +138,7 @@ private: s32 m_httpfetch_active; s32 m_httpfetch_active_limit; s32 m_outstanding_hash_sets; - UNORDERED_MAP<unsigned long, std::string> m_remote_file_transfers; + std::unordered_map<unsigned long, std::string> m_remote_file_transfers; // All files up to this name have either been received from a // remote server or failed on all remote servers, so those files |