diff options
author | smf- <smf-@users.noreply.github.com> | 2018-07-07 21:45:34 +0100 |
---|---|---|
committer | smf- <smf-@users.noreply.github.com> | 2018-07-07 21:46:01 +0100 |
commit | faac6a63e789dbbbca526de2eed624d1c28db733 (patch) | |
tree | 31a6679f7492aeaa215342cc752cc0d002ec1686 | |
parent | 779fb01911855ae6add3ec29867c319ccd403006 (diff) |
Fixes for building with Microsoft Visual Studio 2015. (nw)
-rw-r--r-- | src/emu/devcb.h | 18 | ||||
-rw-r--r-- | src/emu/emumem.h | 11 |
2 files changed, 20 insertions, 9 deletions
diff --git a/src/emu/devcb.h b/src/emu/devcb.h index bd50b60f47d..6046e167784 100644 --- a/src/emu/devcb.h +++ b/src/emu/devcb.h @@ -640,7 +640,7 @@ private: , m_delegate(std::forward<T>(func), name, tag, std::add_pointer_t<devcb_read::delegate_device_class_t<T> >(nullptr)) { } template <typename T> - delegate_builder(devcb_read &target, bool append, device_t &devbase, devcb_read::delegate_device_class_t<T> &obj, T &&func, char const *name) + delegate_builder(devcb_read &target, bool append, device_t &devbase, typename devcb_read::delegate_device_class_t<T> &obj, T &&func, char const *name) : builder_base(target, append) , transform_base<output_t, delegate_builder>(DefaultMask & delegate_traits<Delegate>::default_mask) , m_devbase(devbase) @@ -1361,6 +1361,8 @@ private: Delegate m_delegate; }; + friend class delegate_builder::wrapped_builder; + delegate_builder(delegate_builder const &) = delete; delegate_builder &operator=(delegate_builder const &) = delete; delegate_builder &operator=(delegate_builder &&that) = delete; @@ -1379,7 +1381,7 @@ private: , m_delegate(std::forward<T>(func), name, tag, std::add_pointer_t<devcb_write::delegate_device_class_t<T> >(nullptr)) { } template <typename T> - delegate_builder(devcb_write &target, bool append, device_t &devbase, devcb_write::delegate_device_class_t<T> &obj, T &&func, char const *name) + delegate_builder(devcb_write &target, bool append, device_t &devbase, typename devcb_write::delegate_device_class_t<T> &obj, T &&func, char const *name) : builder_base(target, append) , transform_base<mask_t<Input, typename delegate_traits<Delegate>::input_t>, delegate_builder>(DefaultMask & delegate_traits<Delegate>::default_mask) , m_devbase(devbase) @@ -1491,6 +1493,8 @@ private: int const m_linenum; }; + friend class inputline_builder::wrapped_builder; + inputline_builder(inputline_builder const &) = delete; inputline_builder &operator=(inputline_builder const &) = delete; inputline_builder &operator=(inputline_builder &&that) = delete; @@ -1646,6 +1650,8 @@ private: int const m_value; }; + friend class latched_inputline_builder::wrapped_builder; + latched_inputline_builder(latched_inputline_builder const &) = delete; latched_inputline_builder &operator=(latched_inputline_builder const &) = delete; latched_inputline_builder &operator=(latched_inputline_builder &&that) = delete; @@ -1778,6 +1784,8 @@ private: std::string m_tag; }; + friend class ioport_builder::wrapped_builder; + ioport_builder(ioport_builder const &) = delete; ioport_builder &operator=(ioport_builder const &) = delete; ioport_builder &operator=(ioport_builder &&that) = delete; @@ -1876,6 +1884,8 @@ private: std::string m_tag; }; + friend class membank_builder::wrapped_builder; + membank_builder(membank_builder const &) = delete; membank_builder &operator=(membank_builder const &) = delete; membank_builder &operator=(membank_builder &&that) = delete; @@ -1971,6 +1981,8 @@ private: std::string m_tag; }; + friend class output_builder::wrapped_builder; + output_builder(output_builder const &) = delete; output_builder &operator=(output_builder const &) = delete; output_builder &operator=(output_builder &&that) = delete; @@ -2063,6 +2075,8 @@ private: std::string m_message; }; + friend class log_builder::wrapped_builder; + log_builder(log_builder const &) = delete; log_builder &operator=(log_builder const &) = delete; log_builder &operator=(log_builder &&that) = delete; diff --git a/src/emu/emumem.h b/src/emu/emumem.h index 492edf5a4ac..08dbd02ab77 100644 --- a/src/emu/emumem.h +++ b/src/emu/emumem.h @@ -242,13 +242,10 @@ template<int Width, int AddrShift, int Endian> class memory_units_descriptor; static inline constexpr int handler_entry_dispatch_lowbits(int highbits, int width, int ashift) { - if(highbits > 48) - return 48; - if(highbits > 32) - return 32; - if(highbits > 14) - return 14; - return width + ashift; + return (highbits > 48) ? 48 : + (highbits > 32) ? 32 : + (highbits > 14) ? 14 : + width + ashift; } |