Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-11-26 00:48:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

fix conflict with EMPTY macro in zephyr (#6679)

Browse source
This commit is contained in:
tomaszduda23 2024-05-06 21:20:01 +02:00 committed by GitHub
parent d1758a46bd
commit 8463f897e1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
esphome/core/automation.h
View file

@ -24,7 +24,7 @@ template<int... S> struct gens<0, S...> { using type = seq<S...>; }; // NOLINT
template<typename T, typename... X> class TemplatableValue { template<typename T, typename... X> class TemplatableValue {
public: public:
TemplatableValue() : type_(EMPTY) {} TemplatableValue() : type_(NONE) {}
template<typename F, enable_if_t<!is_invocable<F, X...>::value, int> = 0> template<typename F, enable_if_t<!is_invocable<F, X...>::value, int> = 0>
TemplatableValue(F value) : type_(VALUE), value_(value) {} TemplatableValue(F value) : type_(VALUE), value_(value) {}
@ -32,13 +32,13 @@ template<typename T, typename... X> class TemplatableValue {
template<typename F, enable_if_t<is_invocable<F, X...>::value, int> = 0> template<typename F, enable_if_t<is_invocable<F, X...>::value, int> = 0>
TemplatableValue(F f) : type_(LAMBDA), f_(f) {} TemplatableValue(F f) : type_(LAMBDA), f_(f) {}
bool has_value() { return this->type_ != EMPTY; } bool has_value() { return this->type_ != NONE; }
T value(X... x) { T value(X... x) {
if (this->type_ == LAMBDA) { if (this->type_ == LAMBDA) {
return this->f_(x...); return this->f_(x...);
} }
// return value also when empty // return value also when none
return this->value_; return this->value_;
} }
@ -58,7 +58,7 @@ template<typename T, typename... X> class TemplatableValue {
protected: protected:
enum { enum {
EMPTY, NONE,
VALUE, VALUE,
LAMBDA, LAMBDA,
} type_; } type_;