From 54155441e9ba9941e85d80c4834a66376a11e791 Mon Sep 17 00:00:00 2001 From: Firehawke Date: Wed, 13 Dec 2017 21:01:10 -0700 Subject: Revert "Merge branch 'master' of https://github.com/mamedev/mame" This reverts commit f537428e5a40ba6dde8ca9bf0fe9ae6b1f189ac4, reversing changes made to 0d70d798107d4e4e8fb9f230410aeb1e888d65c5. --- src/emu/emucore.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'src/emu/emucore.h') diff --git a/src/emu/emucore.h b/src/emu/emucore.h index b6d1e7b3154..1782ac8726d 100644 --- a/src/emu/emucore.h +++ b/src/emu/emucore.h @@ -255,7 +255,6 @@ template constexpr T bitswap(T val, U b, return (BIT(val, b) << sizeof...(c)) | bitswap(val, c...); } -// explicit version that checks number of bit position arguments template T bitswap(T val, U... b) { static_assert(sizeof...(b) == B, "wrong number of bits"); @@ -263,6 +262,16 @@ template T bitswap(T val, U... b) return bitswap(val, b...); } +// explicit versions that check number of bit position arguments +template constexpr T BITSWAP8(T val, U... b) { return bitswap<8U>(val, b...); } +template constexpr T BITSWAP16(T val, U... b) { return bitswap<16U>(val, b...); } +template constexpr T BITSWAP24(T val, U... b) { return bitswap<24U>(val, b...); } +template constexpr T BITSWAP32(T val, U... b) { return bitswap<32U>(val, b...); } +template constexpr T BITSWAP40(T val, U... b) { return bitswap<40U>(val, b...); } +template constexpr T BITSWAP48(T val, U... b) { return bitswap<48U>(val, b...); } +template constexpr T BITSWAP56(T val, U... b) { return bitswap<56U>(val, b...); } +template constexpr T BITSWAP64(T val, U... b) { return bitswap<64U>(val, b...); } + //************************************************************************** -- cgit v1.2.3-70-g09d2