diff options
| author | 2019-10-05 00:37:55 +1000 | |
|---|---|---|
| committer | 2019-10-05 00:37:55 +1000 | |
| commit | d8998f5d9b01a2fcc3eefba7679a668518fa6657 (patch) | |
| tree | 384a947e48c09d36e186d8fd75275976036daae6 /src/lib/netlist/prg/nlwav.cpp | |
| parent | f3c71b080a9356e715e03ea944ef578ca5e24e1d (diff) | |
(nw) fix std::array initialisation with GCC5 in nlwav.cpp, stop suppressing -Wterminate now that asserts are really asserts
Diffstat (limited to 'src/lib/netlist/prg/nlwav.cpp')
| -rw-r--r-- | src/lib/netlist/prg/nlwav.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/netlist/prg/nlwav.cpp b/src/lib/netlist/prg/nlwav.cpp index db55290d618..5ebd2ce01fb 100644 --- a/src/lib/netlist/prg/nlwav.cpp +++ b/src/lib/netlist/prg/nlwav.cpp @@ -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 }; |
