diff options
author | 2016-11-19 05:35:54 +1100 | |
---|---|---|
committer | 2016-11-19 05:38:48 +1100 | |
commit | 8179a84458204a5e767446fcf7d10f032a40fd0c (patch) | |
tree | 16105e1667f811dcb24dbf0fc255166cb06df5c2 /src/emu/emualloc.h | |
parent | 1b489fe83034072149fb0637b20c7ba57dc72a7a (diff) |
Introduce u8/u16/u32/u64/s8/s16/s32/s64
* New abbreviated types are in osd and util namespaces, and also in global namespace for things that #include "emu.h"
* Get rid of import of cstdint types to global namespace (C99 does this anyway)
* Remove the cstdint types from everything in emu
* Get rid of U64/S64 macros
* Fix a bug in dps16 caused by incorrect use of macro
* Fix debugcon not checking for "do " prefix case-insensitively
* Fix a lot of messed up tabulation
* More constexpr
* Fix up many __names
Diffstat (limited to 'src/emu/emualloc.h')
-rw-r--r-- | src/emu/emualloc.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/emu/emualloc.h b/src/emu/emualloc.h index 44e39e199ad..77fcd92c1b1 100644 --- a/src/emu/emualloc.h +++ b/src/emu/emualloc.h @@ -10,8 +10,8 @@ #pragma once -#ifndef __EMUALLOC_H__ -#define __EMUALLOC_H__ +#ifndef MAME_EMU_EMUALLOC_H +#define MAME_EMU_EMUALLOC_H #include <new> #include <mutex> @@ -49,7 +49,7 @@ public: m_ordered_prev(nullptr), m_ptr(ptr), m_size(size), - m_id(~(uint64_t)0) { } + m_id(~osd::u64(0)) { } virtual ~resource_pool_item() { } resource_pool_item * m_next; @@ -57,7 +57,7 @@ public: resource_pool_item * m_ordered_prev; void * m_ptr; size_t m_size; - uint64_t m_id; + osd::u64 m_id; }; @@ -129,8 +129,8 @@ private: std::vector<resource_pool_item *> m_hash; resource_pool_item * m_ordered_head; resource_pool_item * m_ordered_tail; - static uint64_t s_id; + static osd::u64 s_id; }; -#endif /* __EMUALLOC_H__ */ +#endif /* MAME_EMU_EMUALLOC_H */ |