From a356b5199dce3b1294dcc09f88ecf02595e97a71 Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Thu, 28 Oct 2021 09:04:42 +0200 Subject: [PATCH] Cope with stupid GCC --- radio/src/storage/conversions/conversions_220_221.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/radio/src/storage/conversions/conversions_220_221.cpp b/radio/src/storage/conversions/conversions_220_221.cpp index e7276331d..f4bc9884b 100644 --- a/radio/src/storage/conversions/conversions_220_221.cpp +++ b/radio/src/storage/conversions/conversions_220_221.cpp @@ -69,9 +69,10 @@ static const char* convertData_220_to_221( } #if defined(COLORLCD) -template void patchWidgetOptions(T& zones) +void patchWidgetOptions(ZonePersistentData* zones, unsigned n_zones) { - for (auto& zone : zones) { + for (unsigned i = 0; i < n_zones; i++) { + auto& zone = zones[i]; auto name_len = strnlen(zone.widgetName, sizeof(zone.widgetName)); std::string widgetName(zone.widgetName, name_len); @@ -91,10 +92,10 @@ static void patchModelData(uint8_t* data) if (!strnlen(screen.LayoutId, sizeof(screen.LayoutId))) break; - patchWidgetOptions(screen.layoutData.zones); + patchWidgetOptions(screen.layoutData.zones, MAX_LAYOUT_ZONES); } - patchWidgetOptions(md->topbarData.zones); + patchWidgetOptions(md->topbarData.zones, MAX_TOPBAR_ZONES); } #else #define patchModelData nullptr