github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-09-15 09:08:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: use inline function for empty vector to avoid EMPTY macro clash and static local overhead

Browse Source
This commit is contained in:
J. Nick Koston
2026-03-26 12:56:30 -10:00
parent 013d832475
commit 236d1ea88f
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/climate/climate_traits.h
+8 -4
View File
@@ -41,6 +41,12 @@ inline const char *vector_find(const std::vector<const char *> &vec, const char
return nullptr;
}
/// Shared empty vector for returning const references when no custom modes are set.
inline const std::vector<const char *> &get_empty_custom_modes() {
static const std::vector<const char *> INSTANCE;
return INSTANCE;
}
/** This class contains all static data for climate devices.
*
* All climate devices must support these features:
@@ -157,8 +163,7 @@ class ClimateTraits {
}
const std::vector<const char *> &get_supported_custom_fan_modes() const {
static const std::vector<const char *> EMPTY;
return this->supported_custom_fan_modes_ ? *this->supported_custom_fan_modes_ : EMPTY;
return this->supported_custom_fan_modes_ ? *this->supported_custom_fan_modes_ : get_empty_custom_modes();
}
bool supports_custom_fan_mode(const char *custom_fan_mode) const {
return this->supported_custom_fan_modes_ && vector_contains(*this->supported_custom_fan_modes_, custom_fan_mode);
@@ -178,8 +183,7 @@ class ClimateTraits {
}
const std::vector<const char *> &get_supported_custom_presets() const {
static const std::vector<const char *> EMPTY;
return this->supported_custom_presets_ ? *this->supported_custom_presets_ : EMPTY;
return this->supported_custom_presets_ ? *this->supported_custom_presets_ : get_empty_custom_modes();
}
bool supports_custom_preset(const char *custom_preset) const {
return this->supported_custom_presets_ && vector_contains(*this->supported_custom_presets_, custom_preset);