Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-04 16:34:53 +03:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

(nw) fix std::array initialisation with GCC5 in nlwav.cpp, stop suppressing -Wterminate now that asserts are really asserts

Browse Source
This commit is contained in:
Vas Crabb 2019-10-05 00:37:55 +10:00
parent f3c71b080a
commit d8998f5d9b
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/genie.lua
View File

@ -1520,12 +1520,6 @@ configuration { "vsllvm" }
}
-- adding this till we sort out asserts in debug mode
configuration { "Debug", "gmake" }
buildoptions_cpp {
"-Wno-terminate",
}
configuration { }
if (_OPTIONS["SOURCES"] ~= nil) then

8
src/lib/netlist/prg/nlwav.cpp
View File

@ -75,9 +75,9 @@ public:
private:
struct riff_chunk_t
{
std::array<uint8_t, 4> group_id = {'R','I','F','F'};
std::array<uint8_t, 4> group_id = {{'R','I','F','F'}};
uint32_t filelen = 0;
std::array<uint8_t, 4> rifftype = {'W','A','V','E'};
std::array<uint8_t, 4> rifftype = {{'W','A','V','E'}};
};
struct riff_format_t
@ -89,7 +89,7 @@ private:
block_align = channels * ((bits_sample + 7) / 8);
bytes_per_second = sample_rate * block_align;
}
std::array<uint8_t, 4> signature = {'f','m','t',' '};
std::array<uint8_t, 4> signature = {{'f','m','t',' '}};
uint32_t fmt_length = 16;
uint16_t format_tag = 0x0001; // PCM
uint16_t channels;
@ -102,7 +102,7 @@ private:
struct riff_data_t
{
riff_data_t(uint32_t alen) : len(alen) {}
std::array<uint8_t, 4> signature = {'d','a','t','a'};
std::array<uint8_t, 4> signature = {{'d','a','t','a'}};
uint32_t len;
// data follows
};