summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/machine/hd64610.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/machine/hd64610.h')
-rw-r--r--src/devices/machine/hd64610.h15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/devices/machine/hd64610.h b/src/devices/machine/hd64610.h
index fd3fd4dec38..edaa7a70c16 100644
--- a/src/devices/machine/hd64610.h
+++ b/src/devices/machine/hd64610.h
@@ -21,10 +21,10 @@
**********************************************************************/
-#pragma once
+#ifndef MAME_MACHINE_HD64610_H
+#define MAME_MACHINE_HD64610_H
-#ifndef __HD64610__
-#define __HD64610__
+#pragma once
#include "dirtc.h"
@@ -55,8 +55,8 @@ public:
// construction/destruction
hd64610_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<hd64610_device &>(device).m_out_irq_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_out_1hz_callback(device_t &device, _Object object) { return downcast<hd64610_device &>(device).m_out_1hz_cb.set_callback(object); }
+ template <class Object> static devcb_base &set_out_irq_callback(device_t &device, Object &&cb) { return downcast<hd64610_device &>(device).m_out_irq_cb.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_out_1hz_callback(device_t &device, Object &&cb) { return downcast<hd64610_device &>(device).m_out_1hz_cb.set_callback(std::forward<Object>(cb)); }
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );
@@ -98,7 +98,6 @@ private:
// device type definition
-extern const device_type HD64610;
-
+DECLARE_DEVICE_TYPE(HD64610, hd64610_device)
-#endif
+#endif // MAME_MACHINE_HD64610_H