From c9f5617f06503d951b3ed808cf07fb6362a7f8d1 Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Sat, 8 Dec 2018 14:22:20 -0800
Subject: Avoid several uses of memset

---
 Alc/bformatdec.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Alc/bformatdec.h')

diff --git a/Alc/bformatdec.h b/Alc/bformatdec.h
index 73754be8..f2cdcdfb 100644
--- a/Alc/bformatdec.h
+++ b/Alc/bformatdec.h
@@ -41,7 +41,7 @@ public:
 private:
     ALuint mEnabled; /* Bitfield of enabled channels. */
 
-    union {
+    union MatrixU {
         alignas(16) ALfloat Dual[MAX_OUTPUT_CHANNELS][sNumBands][MAX_AMBI_COEFFS];
         alignas(16) ALfloat Single[MAX_OUTPUT_CHANNELS][MAX_AMBI_COEFFS];
     } mMatrix;
@@ -89,7 +89,7 @@ private:
 
     BandSplitter mXOver[4];
 
-    ALfloat mGains[4][MAX_OUTPUT_CHANNELS][sNumBands];
+    std::array<std::array<std::array<ALfloat,sNumBands>,MAX_OUTPUT_CHANNELS>,4> mGains;
 
 public:
     void reset(const ALCdevice *device, const ALfloat w_scale, const ALfloat xyz_scale);
-- 
cgit v1.2.3