summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/etc
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2016-04-24 15:15:04 +0200
committer Miodrag Milanovic <mmicko@gmail.com>2016-04-24 15:38:49 +0200
commit96d123b42c87007222bb545878cdef0116b60885 (patch)
treea611581b57d4debe784f1134a3de95426a7ba592 /src/mame/etc
parentc2c22570779f69e6921499b7abeb75f6db3d7822 (diff)
NULL->nullptr, instead of DEVCB_NULL use always DEVCB_NOOP to prevent confusion (nw)
Diffstat (limited to 'src/mame/etc')
-rw-r--r--src/mame/etc/jrcrypt.cpp2
-rw-r--r--src/mame/etc/template_cpu.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mame/etc/jrcrypt.cpp b/src/mame/etc/jrcrypt.cpp
index 89c1fc0b716..a689cf8c800 100644
--- a/src/mame/etc/jrcrypt.cpp
+++ b/src/mame/etc/jrcrypt.cpp
@@ -489,7 +489,7 @@ void main()
void Load(char *name,byte *buffer,int from, int length)
{
/*
- emu_file file(options, NULL, OPEN_FLAG_READ);
+ emu_file file(options, nullptr, OPEN_FLAG_READ);
osd_file::error filerr = file.open(name);
if (filerr != osd_file::error::NONE)
return;
diff --git a/src/mame/etc/template_cpu.h b/src/mame/etc/template_cpu.h
index 07fb81e6284..04b06ef0ff5 100644
--- a/src/mame/etc/template_cpu.h
+++ b/src/mame/etc/template_cpu.h
@@ -39,7 +39,7 @@ protected:
virtual void execute_set_input(int inputnum, int state) override;
// device_memory_interface overrides
- virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_DATA) ? &m_data_config : NULL ); }
+ virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_DATA) ? &m_data_config : nullptr ); }
// device_state_interface overrides
virtual void state_string_export(const device_state_entry &entry, std::string &str) const override;