diff options
| author | 2015-12-28 11:27:47 +0100 | |
|---|---|---|
| committer | 2015-12-28 11:27:47 +0100 | |
| commit | 2a5e044fc23624a388bdb5f82ef9c11cbed6a9c7 (patch) | |
| tree | b468f54cdcbb7252d14790a7a013b138b1bd9b03 /src/emu/memarray.cpp | |
| parent | 077fe7ad89d65bbeafde141c9b3f71ca8df42f1c (diff) | |
| parent | 11fcbaa28583023ea93a8f0c1f3fb9082d3295ab (diff) | |
Merge https://github.com/mamedev/mame
# Conflicts:
# src/devices/video/ef9365.cpp
Diffstat (limited to 'src/emu/memarray.cpp')
| -rw-r--r-- | src/emu/memarray.cpp | 8 |
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); |
