summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/emualloc.h
diff options
context:
space:
mode:
author ImJezze <jezze@gmx.net>2016-02-21 11:48:45 +0100
committer ImJezze <jezze@gmx.net>2016-02-21 11:48:45 +0100
commitcc24a339d8c0517259084b5c178d784626ba965c (patch)
tree9868e9687b5802ae0a3733712a3bbeb3bc75c953 /src/emu/emualloc.h
parentb5daabda5495dea5c50e17961ecfed2ea8619d76 (diff)
Merge remote-tracking branch 'refs/remotes/mamedev/master'
Second attempt
Diffstat (limited to 'src/emu/emualloc.h')
-rw-r--r--src/emu/emualloc.h3
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;
>-ram_device: MCFG removal, nw mooglyguy2018-08-161-4/+2 * stronger private: use (N, O, P, Q, R) (#3717) David Haywood2018-06-301-2/+3 * Remove emupal.h from emu.h (nw) AJR2018-06-131-0/+1 * as if millions of this pointers suddenly cried out in terror, and were sudden... Vas Crabb2018-06-081-6/+6 * Move the +1 to the proper place in the ROM BIOS macros - that's been Vas Crabb2018-05-291-2/+2 * Removed DRIVER_INIT-related macros, made driver init entry in GAME/COMP/CONS ... MooglyGuy2018-05-131-1/+1 * Streamline machine configuration macros - everyone's a device edition. Vas Crabb2018-05-061-3/+3 * Address maps macros removal, pass 1 [O. Galibert] Olivier Galibert2018-03-141-16/+18 * API change: Memory maps are now methods of the owner class [O. Galibert] Olivier Galibert2018-02-121-2/+4 * xtal.h is dead, long live to xtal.cpp [O. Galibert] Olivier Galibert2018-01-231-1/+1 * API Change: Machine configs are now a method of the owner class, and the prot... Olivier Galibert2018-01-171-1/+2 * Remove timer_device from emu.h and move it out of src/emu (nw) AJR2017-10-011-0/+1 * Move static data out of devices into the device types. This is a significant... Vas Crabb2017-05-141-2/+2 * Self-registering devices prep: Vas Crabb2017-02-271-2/+3 * D110: fixed gfx regression, did general cleanup. (nw) Robbbert2016-11-031-67/+75 * NOTICE (TYPE NAME CONSOLIDATION) Miodrag Milanovic2016-10-221-8/+8 * reverting: Miodrag Milanovic2016-01-201-2/+2 * tags are now strings (nw) Miodrag Milanovic2016-01-161-2/+2 * overrides in drivers (nw) Miodrag Milanovic2015-12-061-2/+2