diff options
| author | 2015-12-28 11:27:47 +0100 | |
|---|---|---|
| committer | 2015-12-28 11:27:47 +0100 | |
| commit | 2a5e044fc23624a388bdb5f82ef9c11cbed6a9c7 (patch) | |
| tree | b468f54cdcbb7252d14790a7a013b138b1bd9b03 /src/devices/machine/clock.cpp | |
| parent | 077fe7ad89d65bbeafde141c9b3f71ca8df42f1c (diff) | |
| parent | 11fcbaa28583023ea93a8f0c1f3fb9082d3295ab (diff) | |
Merge https://github.com/mamedev/mame
# Conflicts:
# src/devices/video/ef9365.cpp
Diffstat (limited to 'src/devices/machine/clock.cpp')
| -rw-r--r-- | src/devices/machine/clock.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/devices/machine/clock.cpp b/src/devices/machine/clock.cpp index 9896bebabcc..70d3bd4fade 100644 --- a/src/devices/machine/clock.cpp +++ b/src/devices/machine/clock.cpp @@ -7,7 +7,7 @@ const device_type CLOCK = &device_creator<clock_device>; clock_device::clock_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, CLOCK, "Clock", tag, owner, clock, "clock", __FILE__), m_signal(0), - m_timer(NULL), + m_timer(nullptr), m_signal_handler(*this) { } @@ -44,7 +44,7 @@ void clock_device::update_timer() { if (!m_signal_handler.isnull() && m_clock > 0) { - if (m_timer == NULL) + if (m_timer == nullptr) { m_timer = timer_alloc(0); m_timer->adjust(period()); @@ -61,7 +61,7 @@ void clock_device::update_timer() m_timer->adjust(next); } } - else if (m_timer != NULL) + else if (m_timer != nullptr) { m_timer->adjust(attotime::never); } |
