diff options
author | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-06-06 16:29:28 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-06 16:29:28 +0200 |
commit | d4c0f91275fe70fef73b316c36abfb989dfd55b1 (patch) | |
tree | 6bbd5ebbdbac352c2991854fd88d84abe3ac2224 /src/client | |
parent | 8bdde45895658f16aa6b2546ccb59c5c4c9fc699 (diff) | |
download | minetest-d4c0f91275fe70fef73b316c36abfb989dfd55b1.tar.gz minetest-d4c0f91275fe70fef73b316c36abfb989dfd55b1.tar.bz2 minetest-d4c0f91275fe70fef73b316c36abfb989dfd55b1.zip |
Use C++11 mutexes only (remove compat code) (#5922)
* Fix event LINT & remove default constructor/destructors
* remove compat code & modernize autolock header
Diffstat (limited to 'src/client')
-rw-r--r-- | src/client/clientlauncher.cpp | 2 | ||||
-rw-r--r-- | src/client/tile.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
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<std::string, u32> 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<std::string, u32, u8, u8> m_get_texture_queue; |