C++14 constexpr doesn't cooperate with universal references (nw)

This commit is contained in:
AJR 2017-07-03 10:01:06 -04:00
parent 4ea3dde4f3
commit 91259c7d1d
5 changed files with 26 additions and 11 deletions

View File

@ -186,10 +186,13 @@ class isa8_device : public device_t,
public device_memory_interface
{
public:
static constexpr int AS_ISA_MEM = 0;
static constexpr int AS_ISA_IO = 1;
static constexpr int AS_ISA_MEMALT = 2;
static constexpr int AS_ISA_IOALT = 3;
enum
{
AS_ISA_MEM = 0,
AS_ISA_IO = 1,
AS_ISA_MEMALT = 2,
AS_ISA_IOALT = 3
};
// construction/destruction
isa8_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);

View File

@ -113,8 +113,11 @@ protected:
private:
static constexpr int AS_PCI_MEM = 1;
static constexpr int AS_PCI_IO = 2;
enum
{
AS_PCI_MEM = 1,
AS_PCI_IO = 2
};
struct galileo_timer
{

View File

@ -200,7 +200,10 @@ public:
DECLARE_WRITE16_MEMBER(bridge_control_w);
protected:
static constexpr int AS_PCI_CONFIG = 0;
enum
{
AS_PCI_CONFIG = 0
};
pci_bridge_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);

View File

@ -70,8 +70,11 @@ protected:
address_space *m_cpu_space;
private:
static constexpr int AS_PCI_MEM = 1;
static constexpr int AS_PCI_IO = 2;
enum
{
AS_PCI_MEM = 1,
AS_PCI_IO = 2
};
DECLARE_ADDRESS_MAP(cpu_map, 32);

View File

@ -72,8 +72,11 @@ protected:
virtual void device_reset() override;
private:
static constexpr int AS_PCI_MEM = 1;
static constexpr int AS_PCI_IO = 2;
enum
{
AS_PCI_MEM = 1,
AS_PCI_IO = 2
};
mips3_device *m_cpu;
const char *cpu_tag;