From 8bf3d52fb0b0059c6216ba09f6a189314ca69eca Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Fri, 1 Aug 2025 15:25:10 -1000 Subject: [PATCH] tidy --- esphome/core/application.h | 42 +++++++++++++++++++------------------- esphome/core/helpers.h | 2 +- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/esphome/core/application.h b/esphome/core/application.h index c91cba8d19..b7824a254b 100644 --- a/esphome/core/application.h +++ b/esphome/core/application.h @@ -493,68 +493,68 @@ class Application { std::vector areas_{}; #endif #ifdef USE_BINARY_SENSOR - static_vector binary_sensors_{}; + StaticVector binary_sensors_{}; #endif #ifdef USE_SWITCH - static_vector switches_{}; + StaticVector switches_{}; #endif #ifdef USE_BUTTON - static_vector buttons_{}; + StaticVector buttons_{}; #endif #ifdef USE_EVENT - static_vector events_{}; + StaticVector events_{}; #endif #ifdef USE_SENSOR - static_vector sensors_{}; + StaticVector sensors_{}; #endif #ifdef USE_TEXT_SENSOR - static_vector text_sensors_{}; + StaticVector text_sensors_{}; #endif #ifdef USE_FAN - static_vector fans_{}; + StaticVector fans_{}; #endif #ifdef USE_COVER - static_vector covers_{}; + StaticVector covers_{}; #endif #ifdef USE_CLIMATE - static_vector climates_{}; + StaticVector climates_{}; #endif #ifdef USE_LIGHT - static_vector lights_{}; + StaticVector lights_{}; #endif #ifdef USE_NUMBER - static_vector numbers_{}; + StaticVector numbers_{}; #endif #ifdef USE_DATETIME_DATE - static_vector dates_{}; + StaticVector dates_{}; #endif #ifdef USE_DATETIME_TIME - static_vector times_{}; + StaticVector times_{}; #endif #ifdef USE_DATETIME_DATETIME - static_vector datetimes_{}; + StaticVector datetimes_{}; #endif #ifdef USE_SELECT - static_vector selects_{}; + StaticVector selects_{}; #endif #ifdef USE_TEXT - static_vector texts_{}; + StaticVector texts_{}; #endif #ifdef USE_LOCK - static_vector locks_{}; + StaticVector locks_{}; #endif #ifdef USE_VALVE - static_vector valves_{}; + StaticVector valves_{}; #endif #ifdef USE_MEDIA_PLAYER - static_vector media_players_{}; + StaticVector media_players_{}; #endif #ifdef USE_ALARM_CONTROL_PANEL - static_vector + StaticVector alarm_control_panels_{}; #endif #ifdef USE_UPDATE - static_vector updates_{}; + StaticVector updates_{}; #endif #ifdef USE_SOCKET_SELECT_SUPPORT diff --git a/esphome/core/helpers.h b/esphome/core/helpers.h index 05e57a267e..e937c3bdf2 100644 --- a/esphome/core/helpers.h +++ b/esphome/core/helpers.h @@ -95,7 +95,7 @@ template<> constexpr int64_t byteswap(int64_t n) { return __builtin_bswap64(n); ///@{ /// Minimal static vector - saves memory by avoiding std::vector overhead -template class static_vector { +template class StaticVector { public: using value_type = T; using iterator = typename std::array::iterator;