summaryrefslogtreecommitdiff
path: root/src/emerge.h
diff options
context:
space:
mode:
authorLoïc Blot <nerzhul@users.noreply.github.com>2017-06-04 21:00:04 +0200
committerGitHub <noreply@github.com>2017-06-04 21:00:04 +0200
commita98baef5e4fedca36c8c8755ad7c8233469f6a3f (patch)
treec40d1468774cf988b4567f33e89875e0c43803a7 /src/emerge.h
parent2362d3f926e2702585f60011d4cea90b4faf4bd6 (diff)
downloadminetest-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/emerge.h')
-rw-r--r--src/emerge.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/emerge.h b/src/emerge.h
index 76653e6cd..55be370d2 100644
--- a/src/emerge.h
+++ b/src/emerge.h
@@ -157,7 +157,7 @@ private:
Mutex m_queue_mutex;
std::map<v3s16, BlockEmergeData> m_blocks_enqueued;
- UNORDERED_MAP<u16, u16> m_peer_queue_count;
+ std::unordered_map<u16, u16> m_peer_queue_count;
u16 m_qlimit_total;
u16 m_qlimit_diskonly;