Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-23 00:39:36 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixes for building with Microsoft Visual Studio 2015. (nw)

Browse Source
This commit is contained in:
smf- 2018-07-07 21:45:34 +01:00
parent 779fb01911
commit faac6a63e7
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/emu/devcb.h
View File

@ -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;

11
src/emu/emumem.h
View File

@ -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;
}