diff options
Diffstat (limited to 'src/devices/machine/cr511b.h')
-rw-r--r-- | src/devices/machine/cr511b.h | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/devices/machine/cr511b.h b/src/devices/machine/cr511b.h index 90119d70b82..546dcf51266 100644 --- a/src/devices/machine/cr511b.h +++ b/src/devices/machine/cr511b.h @@ -30,10 +30,10 @@ ***************************************************************************/ -#pragma once +#ifndef MAME_MACHINE_CR511B_H +#define MAME_MACHINE_CR511B_H -#ifndef __CR511B_H__ -#define __CR511B_H__ +#pragma once #include "imagedev/chd_cd.h" #include "sound/cdda.h" @@ -77,23 +77,23 @@ public: cr511b_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // callbacks - template<class _Object> static devcb_base &set_stch_handler(device_t &device, _Object object) - { return downcast<cr511b_device &>(device).m_stch_handler.set_callback(object); } + template <class Object> static devcb_base &set_stch_handler(device_t &device, Object &&cb) + { return downcast<cr511b_device &>(device).m_stch_handler.set_callback(std::forward<Object>(cb)); } - template<class _Object> static devcb_base &set_sten_handler(device_t &device, _Object object) - { return downcast<cr511b_device &>(device).m_sten_handler.set_callback(object); } + template <class Object> static devcb_base &set_sten_handler(device_t &device, Object &&cb) + { return downcast<cr511b_device &>(device).m_sten_handler.set_callback(std::forward<Object>(cb)); } - template<class _Object> static devcb_base &set_drq_handler(device_t &device, _Object object) - { return downcast<cr511b_device &>(device).m_drq_handler.set_callback(object); } + template <class Object> static devcb_base &set_drq_handler(device_t &device, Object &&cb) + { return downcast<cr511b_device &>(device).m_drq_handler.set_callback(std::forward<Object>(cb)); } - template<class _Object> static devcb_base &set_dten_handler(device_t &device, _Object object) - { return downcast<cr511b_device &>(device).m_dten_handler.set_callback(object); } + template <class Object> static devcb_base &set_dten_handler(device_t &device, Object &&cb) + { return downcast<cr511b_device &>(device).m_dten_handler.set_callback(std::forward<Object>(cb)); } - template<class _Object> static devcb_base &set_scor_handler(device_t &device, _Object object) - { return downcast<cr511b_device &>(device).m_scor_handler.set_callback(object); } + template <class Object> static devcb_base &set_scor_handler(device_t &device, Object &&cb) + { return downcast<cr511b_device &>(device).m_scor_handler.set_callback(std::forward<Object>(cb)); } - template<class _Object> static devcb_base &set_xaen_handler(device_t &device, _Object object) - { return downcast<cr511b_device &>(device).m_xaen_handler.set_callback(object); } + template <class Object> static devcb_base &set_xaen_handler(device_t &device, Object &&cb) + { return downcast<cr511b_device &>(device).m_xaen_handler.set_callback(std::forward<Object>(cb)); } DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER ( write ); @@ -144,6 +144,6 @@ private: }; // device type definition -extern const device_type CR511B; +DECLARE_DEVICE_TYPE(CR511B, cr511b_device) -#endif +#endif // MAME_MACHINE_CR511B_H |