From 12cb77cd7c52e441257d00757c3c70f66de79962 Mon Sep 17 00:00:00 2001 From: Thad House Date: Sat, 9 Feb 2019 00:07:24 -0800 Subject: [PATCH] Fix DS Comm button tests (#1591) Mac requires the double braces --- .../halsim_ds_socket/src/test/native/cpp/DSCommPacketTest.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/simulation/halsim_ds_socket/src/test/native/cpp/DSCommPacketTest.cpp b/simulation/halsim_ds_socket/src/test/native/cpp/DSCommPacketTest.cpp index 91190fba19..c1fc2932b9 100644 --- a/simulation/halsim_ds_socket/src/test/native/cpp/DSCommPacketTest.cpp +++ b/simulation/halsim_ds_socket/src/test/native/cpp/DSCommPacketTest.cpp @@ -67,9 +67,9 @@ TEST_F(DSCommPacketTest, BlankJoystickTag) { TEST_F(DSCommPacketTest, MainJoystickTag) { for (int i = 0; i < HAL_kMaxJoysticks; i++) { // Just random data - std::array _buttons{0, 1, 0, 0, 1, 1, 0, 1, 0, 1, 0, 1}; + std::array _buttons{{0, 1, 0, 0, 1, 1, 0, 1, 0, 1, 0, 1}}; - std::array _button_bytes{0, 0}; + std::array _button_bytes{{0, 0}}; for (int btn = 0; btn < 8; btn++) _button_bytes[1] |= _buttons[btn] << btn; for (int btn = 8; btn < 12; btn++) _button_bytes[0] |= _buttons[btn] << (btn - 8);