Sprinter/mame
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compile error on Linux with NO_USE_XINPUT=0

Browse Source 
In file included from /usr/include/X11/extensions/XInput.h:53:0,
                     from ../../../../../src/osd/modules/input/input_x11.cpp:18:
    ../../../../../src/emu/save.h:95:32: error: expected unqualified-id before numeric constant
       static constexpr std::size_t COUNT = 1U;
                                    ^
    ../../../../../src/emu/save.h:102:32: error: expected unqualified-id before numeric constant
       static constexpr std::size_t COUNT = N * array_unwrap<T>::COUNT;
                                    ^
    ../../../../../src/emu/save.h:109:32: error: expected unqualified-id before numeric constant
       static constexpr std::size_t COUNT = N * array_unwrap<T>::COUNT;
                                    ^
    ../../../../../src/emu/save.h: In member function ‘void save_manager::save_item(device_t*, const char*, const char*, int, ItemType&, const char*)’:
    ../../../../../src/emu/save.h:154:142: error: expected unqualified-id before numeric constant
       save_memory(device, module, tag, index, valname, array_unwrap<ItemType>::ptr(value), array_unwrap<ItemType>::SIZE, array_unwrap<ItemType>::COUNT);
                                                                                                                                                  ^
    ../../../../../src/emu/save.h: In member function ‘void save_manager::save_pointer(device_t*, const char*, const char*, int, ItemType*, const char*, u32)’:
    ../../../../../src/emu/save.h:163:145: error: expected unqualified-id before numeric constant
       save_memory(device, module, tag, index, valname, array_unwrap<ItemType>::ptr(value[0]), array_unwrap<ItemType>::SIZE, array_unwrap<ItemType>::COUNT * count);
                                                                                                                                                     ^
    ../../../../../src/emu/save.h: In member function ‘void save_manager::save_pointer(device_t*, const char*, const char*, int, std::unique_ptr<_Tp []>&, const char*, u32)’:
    ../../../../../src/emu/save.h:172:145: error: expected unqualified-id before numeric constant
       save_memory(device, module, tag, index, valname, array_unwrap<ItemType>::ptr(value[0]), array_unwrap<ItemType>::SIZE, array_unwrap<ItemType>::COUNT * count);
This commit is contained in:
Kiall Mac Innes 2018-10-11 11:44:15 +01:00
parent 856478fbda
commit 57692561cd
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/emu/save.h
View File

@ -92,21 +92,21 @@ class save_manager
template <typename T> struct array_unwrap template <typename T> struct array_unwrap
{ {
using underlying_type = T; using underlying_type = T;
static constexpr std::size_t COUNT = 1U; static constexpr std::size_t SAVE_COUNT = 1U;
static constexpr std::size_t SIZE = sizeof(underlying_type); static constexpr std::size_t SIZE = sizeof(underlying_type);
static underlying_type *ptr(T &value) { return &value; } static underlying_type *ptr(T &value) { return &value; }
}; };
template <typename T, std::size_t N> struct array_unwrap<T[N]> template <typename T, std::size_t N> struct array_unwrap<T[N]>
{ {
using underlying_type = typename array_unwrap<T>::underlying_type; using underlying_type = typename array_unwrap<T>::underlying_type;
static constexpr std::size_t COUNT = N * array_unwrap<T>::COUNT; static constexpr std::size_t SAVE_COUNT = N * array_unwrap<T>::SAVE_COUNT;
static constexpr std::size_t SIZE = sizeof(underlying_type); static constexpr std::size_t SIZE = sizeof(underlying_type);
static underlying_type *ptr(T (&value)[N]) { return array_unwrap<T>::ptr(value[0]); } static underlying_type *ptr(T (&value)[N]) { return array_unwrap<T>::ptr(value[0]); }
}; };
template <typename T, std::size_t N> struct array_unwrap<std::array<T, N> > template <typename T, std::size_t N> struct array_unwrap<std::array<T, N> >
{ {
using underlying_type = typename array_unwrap<T>::underlying_type; using underlying_type = typename array_unwrap<T>::underlying_type;
static constexpr std::size_t COUNT = N * array_unwrap<T>::COUNT; static constexpr std::size_t SAVE_COUNT = N * array_unwrap<T>::SAVE_COUNT;
static constexpr std::size_t SIZE = sizeof(underlying_type); static constexpr std::size_t SIZE = sizeof(underlying_type);
static underlying_type *ptr(std::array<T, N> &value) { return array_unwrap<T>::ptr(value[0]); } static underlying_type *ptr(std::array<T, N> &value) { return array_unwrap<T>::ptr(value[0]); }
}; };
@ -151,7 +151,7 @@ public:
throw emu_fatalerror("Called save_item on a pointer with no count!"); throw emu_fatalerror("Called save_item on a pointer with no count!");
if (!type_checker<typename array_unwrap<ItemType>::underlying_type>::is_atom) if (!type_checker<typename array_unwrap<ItemType>::underlying_type>::is_atom)
throw emu_fatalerror("Called save_item on a non-fundamental type!"); throw emu_fatalerror("Called save_item on a non-fundamental type!");
save_memory(device, module, tag, index, valname, array_unwrap<ItemType>::ptr(value), array_unwrap<ItemType>::SIZE, array_unwrap<ItemType>::COUNT); save_memory(device, module, tag, index, valname, array_unwrap<ItemType>::ptr(value), array_unwrap<ItemType>::SIZE, array_unwrap<ItemType>::SAVE_COUNT);
} }
// templatized wrapper for pointers // templatized wrapper for pointers
@ -160,7 +160,7 @@ public:
{ {
if (!type_checker<typename array_unwrap<ItemType>::underlying_type>::is_atom) if (!type_checker<typename array_unwrap<ItemType>::underlying_type>::is_atom)
throw emu_fatalerror("Called save_item on a non-fundamental type!"); throw emu_fatalerror("Called save_item on a non-fundamental type!");
save_memory(device, module, tag, index, valname, array_unwrap<ItemType>::ptr(value[0]), array_unwrap<ItemType>::SIZE, array_unwrap<ItemType>::COUNT * count); save_memory(device, module, tag, index, valname, array_unwrap<ItemType>::ptr(value[0]), array_unwrap<ItemType>::SIZE, array_unwrap<ItemType>::SAVE_COUNT * count);
} }
// templatized wrapper for std::unique_ptr // templatized wrapper for std::unique_ptr
@ -169,7 +169,7 @@ public:
{ {
if (!type_checker<typename array_unwrap<ItemType>::underlying_type>::is_atom) if (!type_checker<typename array_unwrap<ItemType>::underlying_type>::is_atom)
throw emu_fatalerror("Called save_item on a non-fundamental type!"); throw emu_fatalerror("Called save_item on a non-fundamental type!");
save_memory(device, module, tag, index, valname, array_unwrap<ItemType>::ptr(value[0]), array_unwrap<ItemType>::SIZE, array_unwrap<ItemType>::COUNT * count); save_memory(device, module, tag, index, valname, array_unwrap<ItemType>::ptr(value[0]), array_unwrap<ItemType>::SIZE, array_unwrap<ItemType>::SAVE_COUNT * count);
} }
// global memory registration // global memory registration