summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/memarray.cpp
diff options
context:
space:
mode:
author ImJezze <jezze@gmx.net>2015-12-13 11:23:55 +0100
committer ImJezze <jezze@gmx.net>2015-12-13 11:23:55 +0100
commit4e580a77b9da9b78aba1fec8e44b1de5a4a14aaf (patch)
treedf0e1d28daa79b9151088498a933cd1fc37c9c07 /src/emu/memarray.cpp
parent1cda42b22e591965ee69561fcf52272bd991b3b2 (diff)
parent14d5966a379e9783ba724750a5f84a72af62cadc (diff)
Merge pull request #9 from mamedev/master
Sync to base master
Diffstat (limited to 'src/emu/memarray.cpp')
-rw-r--r--src/emu/memarray.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/emu/memarray.cpp b/src/emu/memarray.cpp
index 94662f0c7b0..03161f000bf 100644
--- a/src/emu/memarray.cpp
+++ b/src/emu/memarray.cpp
@@ -20,13 +20,13 @@
//-------------------------------------------------
memory_array::memory_array()
- : m_base(NULL),
+ : m_base(nullptr),
m_bytes(0),
m_membits(0),
m_endianness(ENDIANNESS_LITTLE),
m_bytes_per_entry(0),
- m_read_entry(NULL),
- m_write_entry(NULL)
+ m_read_entry(nullptr),
+ m_write_entry(nullptr)
{
}
@@ -38,7 +38,7 @@ memory_array::memory_array()
void memory_array::set(void *base, UINT32 bytes, int membits, endianness_t endianness, int bpe)
{
// validate inputs
- assert(base != NULL);
+ assert(base != nullptr);
assert(bytes > 0);
assert(membits == 8 || membits == 16 || membits == 32 || membits == 64);
assert(bpe == 1 || bpe == 2 || bpe == 4);