Skip to content

Commit

Permalink
avoid name collisions (max in arduino-avr)
Browse files Browse the repository at this point in the history
  • Loading branch information
jandelgado committed Dec 1, 2024
1 parent f1e8844 commit 1ce7f41
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/jled_base.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ uint8_t lerp8by8(uint8_t val, uint8_t a, uint8_t b);
uint8_t invlerp8by8(uint8_t val, uint8_t a, uint8_t b);

template <typename T>
static constexpr T max(T a, T b) {
static constexpr T __max(T a, T b) {
return (a > b) ? a : b;
}

Expand Down Expand Up @@ -500,10 +500,10 @@ class TJLed {
// this is where the BrightnessEvaluator object will be stored using
// placment new. Set MAX_SIZE to class occupying most memory
static constexpr auto MAX_SIZE =
max(sizeof(CandleBrightnessEvaluator),
max(sizeof(BreatheBrightnessEvaluator),
max(sizeof(ConstantBrightnessEvaluator), // NOLINT
sizeof(BlinkBrightnessEvaluator))));
__max(sizeof(CandleBrightnessEvaluator),
__max(sizeof(BreatheBrightnessEvaluator),
__max(sizeof(ConstantBrightnessEvaluator), // NOLINT
sizeof(BlinkBrightnessEvaluator))));
alignas(alignof(
CloneableBrightnessEvaluator)) char brightness_eval_buf_[MAX_SIZE];

Expand Down

0 comments on commit 1ce7f41

Please sign in to comment.