diff options
author | 2016-02-21 11:48:45 +0100 | |
---|---|---|
committer | 2016-02-21 11:48:45 +0100 | |
commit | cc24a339d8c0517259084b5c178d784626ba965c (patch) | |
tree | 9868e9687b5802ae0a3733712a3bbeb3bc75c953 /src/emu/emualloc.h | |
parent | b5daabda5495dea5c50e17961ecfed2ea8619d76 (diff) |
Merge remote-tracking branch 'refs/remotes/mamedev/master'
Second attempt
Diffstat (limited to 'src/emu/emualloc.h')
-rw-r--r-- | src/emu/emualloc.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/emu/emualloc.h b/src/emu/emualloc.h index 4571762054f..37b5c63d860 100644 --- a/src/emu/emualloc.h +++ b/src/emu/emualloc.h @@ -14,6 +14,7 @@ #define __EMUALLOC_H__ #include <new> +#include <mutex> #include "osdcore.h" #include "coretmpl.h" @@ -124,7 +125,7 @@ public: private: int m_hash_size; - osd_lock * m_listlock; + std::mutex m_listlock; std::vector<resource_pool_item *> m_hash; resource_pool_item * m_ordered_head; resource_pool_item * m_ordered_tail; |