From d4c0f91275fe70fef73b316c36abfb989dfd55b1 Mon Sep 17 00:00:00 2001 From: Loïc Blot Date: Tue, 6 Jun 2017 16:29:28 +0200 Subject: Use C++11 mutexes only (remove compat code) (#5922) * Fix event LINT & remove default constructor/destructors * remove compat code & modernize autolock header --- src/client/clientlauncher.cpp | 2 +- src/client/tile.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/client') diff --git a/src/client/clientlauncher.cpp b/src/client/clientlauncher.cpp index 3e8fa2f2f..aeab82512 100644 --- a/src/client/clientlauncher.cpp +++ b/src/client/clientlauncher.cpp @@ -657,7 +657,7 @@ void ClientLauncher::speed_tests() infostream << "Around 5000/ms should do well here." << std::endl; TimeTaker timer("Testing mutex speed"); - Mutex m; + std::mutex m; u32 n = 0; u32 i = 0; do { diff --git a/src/client/tile.cpp b/src/client/tile.cpp index 0918836e5..10a9d5f0d 100644 --- a/src/client/tile.cpp +++ b/src/client/tile.cpp @@ -417,7 +417,7 @@ private: // Maps a texture name to an index in the former. std::map m_name_to_id; // The two former containers are behind this mutex - Mutex m_textureinfo_cache_mutex; + std::mutex m_textureinfo_cache_mutex; // Queued texture fetches (to be processed by the main thread) RequestQueue m_get_texture_queue; -- cgit v1.2.3