From f5b16f32f5bedb491396370bd915df3369a16a67 Mon Sep 17 00:00:00 2001 From: Nick Desaulniers Date: Fri, 11 Oct 2019 13:41:59 -0700 Subject: [PATCH] [hardware][interfaces][wifi] fix -Wreorder-init-list C++20 will require members in a designated initializer to be in order unlike C99. Bug: 139945549 Test: mm Change-Id: If22be04df7d2d0aae9ed50fada53d0ccd4edc9d1 Signed-off-by: Nick Desaulniers --- wifi/1.3/default/tests/hidl_struct_util_unit_tests.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/wifi/1.3/default/tests/hidl_struct_util_unit_tests.cpp b/wifi/1.3/default/tests/hidl_struct_util_unit_tests.cpp index dbf7bd6113..4e9ebded12 100644 --- a/wifi/1.3/default/tests/hidl_struct_util_unit_tests.cpp +++ b/wifi/1.3/default/tests/hidl_struct_util_unit_tests.cpp @@ -170,12 +170,14 @@ TEST_F(HidlStructUtilTest, canConvertLegacyLinkLayerStatsToHidl) { legacy_hal::wifi_channel_stat channel_stat1 = { .channel = {legacy_hal::WIFI_CHAN_WIDTH_20, 2437, 2437, 0}, + .on_time = 0x1111, .cca_busy_time = 0x55, - .on_time = 0x1111}; + }; legacy_hal::wifi_channel_stat channel_stat2 = { .channel = {legacy_hal::WIFI_CHAN_WIDTH_20, 5180, 5180, 0}, + .on_time = 0x2222, .cca_busy_time = 0x66, - .on_time = 0x2222}; + }; radio.channel_stats.push_back(channel_stat1); radio.channel_stats.push_back(channel_stat2); }