From 9a19a8937080088b157a2101dd92b4dead24a478 Mon Sep 17 00:00:00 2001 From: cam900 Date: Sun, 25 Dec 2022 16:11:29 +0900 Subject: [PATCH] Possibly fix gcc 5.4 --- .../vgsound_emu/src/k007232/k007232.hpp | 4 ++-- .../vgsound_emu/src/x1_010/x1_010.hpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/extern/vgsound_emu-modified/vgsound_emu/src/k007232/k007232.hpp b/extern/vgsound_emu-modified/vgsound_emu/src/k007232/k007232.hpp index ae39d269..c3e2333e 100644 --- a/extern/vgsound_emu-modified/vgsound_emu/src/k007232/k007232.hpp +++ b/extern/vgsound_emu-modified/vgsound_emu/src/k007232/k007232.hpp @@ -87,8 +87,8 @@ class k007232_core : public vgsound_emu_core : vgsound_emu_core("k007232") , m_voice{*this, *this} , m_intf(intf) - , m_reg{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} { + m_reg.fill(0); } // host accessors @@ -111,7 +111,7 @@ class k007232_core : public vgsound_emu_core k007232_intf &m_intf; // common memory interface - std::array m_reg = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; // register pool + std::array m_reg; // register pool }; #endif diff --git a/extern/vgsound_emu-modified/vgsound_emu/src/x1_010/x1_010.hpp b/extern/vgsound_emu-modified/vgsound_emu/src/x1_010/x1_010.hpp index 0456a9fa..85392b8b 100644 --- a/extern/vgsound_emu-modified/vgsound_emu/src/x1_010/x1_010.hpp +++ b/extern/vgsound_emu-modified/vgsound_emu/src/x1_010/x1_010.hpp @@ -87,9 +87,9 @@ class x1_010_core : public vgsound_emu_core , m_acc(0) , m_env_acc(0) , m_data(0) - , m_vol_out{0, 0} - , m_out{0, 0} { + m_vol_out.fill(0); + m_out.fill(0); } // internal state @@ -117,10 +117,10 @@ class x1_010_core : public vgsound_emu_core u32 m_acc = 0; u32 m_env_acc = 0; s8 m_data = 0; - std::array m_vol_out = {0, 0}; + std::array m_vol_out; // for preview only - std::array m_out = {0, 0}; + std::array m_out; }; public: