Remove some deprecated instantiations of static constexpr members (MSVC complains about them now)

This commit is contained in:
Vas Crabb 2020-11-15 13:43:36 +11:00
parent 0fa8be1fb4
commit 253e7f1cae
7 changed files with 6 additions and 39 deletions

View File

@ -8,12 +8,6 @@
DEFINE_DEVICE_TYPE(SGIKBD_PORT, sgi_keyboard_port_device, "sgikbd", "SGI Keyboard Port")
int const device_sgi_keyboard_port_interface::START_BIT_COUNT;
int const device_sgi_keyboard_port_interface::DATA_BIT_COUNT;
device_serial_interface::parity_t const device_sgi_keyboard_port_interface::PARITY;
device_serial_interface::stop_bits_t const device_sgi_keyboard_port_interface::STOP_BITS;
int const device_sgi_keyboard_port_interface::BAUD;
sgi_keyboard_port_device::sgi_keyboard_port_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock)
: sgi_keyboard_port_device(mconfig, SGIKBD_PORT, tag, owner, clock)
{

View File

@ -95,13 +95,6 @@
DEFINE_DEVICE_TYPE(SUNKBD_PORT, sun_keyboard_port_device, "sunkbd", "Sun Keyboard Port")
int const device_sun_keyboard_port_interface::START_BIT_COUNT;
int const device_sun_keyboard_port_interface::DATA_BIT_COUNT;
device_serial_interface::parity_t const device_sun_keyboard_port_interface::PARITY;
device_serial_interface::stop_bits_t const device_sun_keyboard_port_interface::STOP_BITS;
int const device_sun_keyboard_port_interface::BAUD;
sun_keyboard_port_device::sun_keyboard_port_device(
machine_config const &mconfig,

View File

@ -72,13 +72,6 @@
DEFINE_DEVICE_TYPE(SUNMOUSE_PORT, sun_mouse_port_device, "sunmouse", "Sun Mouse Port")
int const device_sun_mouse_port_interface::START_BIT_COUNT;
int const device_sun_mouse_port_interface::DATA_BIT_COUNT;
device_serial_interface::parity_t const device_sun_mouse_port_interface::PARITY;
device_serial_interface::stop_bits_t const device_sun_mouse_port_interface::STOP_BITS;
int const device_sun_mouse_port_interface::BAUD;
sun_mouse_port_device::sun_mouse_port_device(
machine_config const &mconfig,

View File

@ -35,9 +35,6 @@ debug_view_disasm_source::debug_view_disasm_source(std::string &&name, device_t
// DEBUG VIEW DISASM
//**************************************************************************
const int debug_view_disasm::DEFAULT_DASM_LINES, debug_view_disasm::DEFAULT_DASM_WIDTH, debug_view_disasm::DASM_MAX_BYTES;
//-------------------------------------------------
// debug_view_disasm - constructor
//-------------------------------------------------

View File

@ -16,13 +16,6 @@
#include "screen.h"
const int debug_view_state::REG_DIVIDER;
const int debug_view_state::REG_CYCLES;
const int debug_view_state::REG_BEAMX;
const int debug_view_state::REG_BEAMY;
const int debug_view_state::REG_FRAME;
//**************************************************************************
// DEBUG VIEW STATE SOURCE
//**************************************************************************

View File

@ -4167,7 +4167,8 @@ void layout_view::recompute(u32 visibility_mask, bool zoom_to_screen)
// normalize all the item bounds
for (item &curitem : items())
{
curitem.m_bounds = curitem.m_rawbounds;
assert(curitem.m_rawbounds.size() == curitem.m_bounds.size());
std::copy(curitem.m_rawbounds.begin(), curitem.m_rawbounds.end(), curitem.m_bounds.begin());
normalize_bounds(curitem.m_bounds, target_bounds.x0, target_bounds.y0, xoffs, yoffs, xscale, yscale);
}
@ -4478,7 +4479,7 @@ layout_view::item::item(
// this can be called before resolving tags, make it return something valid
m_bounds = m_rawbounds;
m_get_bounds = bounds_delegate(&emu::render::detail::bounds_step::get, &const_cast<emu::render::detail::bounds_step &>(m_bounds.front()));
m_get_bounds = bounds_delegate(&emu::render::detail::bounds_step::get, &m_bounds.front());
}
@ -4558,7 +4559,7 @@ void layout_view::item::resolve_tags()
// choose optional bounds and colour functions
m_get_bounds = (m_bounds.size() == 1U)
? bounds_delegate(&emu::render::detail::bounds_step::get, &const_cast<emu::render::detail::bounds_step &>(m_bounds.front()))
? bounds_delegate(&emu::render::detail::bounds_step::get, &m_bounds.front())
: bounds_delegate(&item::get_interpolated_bounds, this);
m_get_color = (m_color.size() == 1U)
? color_delegate(&emu::render::detail::color_step::get, &const_cast<emu::render::detail::color_step &>(m_color.front()))

View File

@ -12,24 +12,20 @@
#include "hash.h"
#include "hashing.h"
#include <cctype>
namespace util {
//**************************************************************************
// GLOBAL VARIABLES
//**************************************************************************
char const hash_collection::HASH_CRC;
char const hash_collection::HASH_SHA1;
char const *const hash_collection::HASH_TYPES_CRC = "R";
char const *const hash_collection::HASH_TYPES_CRC_SHA1 = "RS";
char const *const hash_collection::HASH_TYPES_ALL = "RS";
char const hash_collection::FLAG_NO_DUMP;
char const hash_collection::FLAG_BAD_DUMP;
//**************************************************************************