summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2019-11-21 21:11:19 +1100
committer Vas Crabb <vas@vastheman.com>2019-11-21 21:11:59 +1100
commitb5ace4609e693e503b25dc669189933ad0b6191a (patch)
tree09172b7ab9b26b149a437b0f8db4bddc1993b71f
parent24c928786e7d6fb9191aea14e3abcb3ded76f8d8 (diff)
I give up, can't keep all the compilers happy (nw)
-rw-r--r--src/emu/input.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/emu/input.h b/src/emu/input.h
index dc76a4a0adb..61f833cfa29 100644
--- a/src/emu/input.h
+++ b/src/emu/input.h
@@ -434,8 +434,8 @@ class input_seq
{
public:
// construction/destruction
- constexpr input_seq() noexcept : input_seq(std::make_index_sequence<std::tuple_size<decltype(m_code)>::value>()) { }
- template <typename... T> constexpr input_seq(input_code code_0, T... code_n) noexcept : input_seq(std::make_index_sequence<std::tuple_size<decltype(m_code)>::value - sizeof...(T) - 1>(), code_0, code_n...) { }
+ input_seq() noexcept : input_seq(std::make_index_sequence<std::tuple_size<decltype(m_code)>::value>()) { }
+ template <typename... T> input_seq(input_code code_0, T... code_n) noexcept : input_seq(std::make_index_sequence<std::tuple_size<decltype(m_code)>::value - sizeof...(T) - 1>(), code_0, code_n...) { }
constexpr input_seq(const input_seq &rhs) noexcept = default;
// operators
@@ -475,7 +475,8 @@ public:
private:
static constexpr input_code get_end_code(size_t) noexcept { return end_code; }
- template <typename... T, size_t... N> constexpr input_seq(std::integer_sequence<size_t, N...>, T... code) noexcept : m_code({ code..., get_end_code(N)... }) { }
+ template <size_t... N, typename... T> input_seq(std::integer_sequence<size_t, N...>, T... code) noexcept : m_code({ code..., get_end_code(N)... }) { }
+ template <size_t... N> input_seq(std::integer_sequence<size_t, N...>) noexcept : m_code({ get_end_code(N)... }) { }
template <unsigned N> void set() noexcept
{