From d027ce5c8038a565fcbfcf284aa5fe749566d8c1 Mon Sep 17 00:00:00 2001 From: Florian Fleissner Date: Sat, 1 Jun 2019 21:48:05 +0200 Subject: [PATCH] Fixed a collision of variable named byte There's also a type called byte. The colliding temporary variable was renamed. Signed-off-by: Florian Fleissner --- src/kaleidoscope/bitfields.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/kaleidoscope/bitfields.cpp b/src/kaleidoscope/bitfields.cpp index 23bb055b..d9eeb642 100644 --- a/src/kaleidoscope/bitfields.cpp +++ b/src/kaleidoscope/bitfields.cpp @@ -44,8 +44,8 @@ bool _BaseBitfield::isBitSetPROGMEM_P(const void *bit_field, uint8_t raw_pos) { uint8_t byte_id = raw_pos >> 3; uint8_t bit_pos = raw_pos & 0x7; const uint8_t *bytes = reinterpret_cast(bit_field); - uint8_t byte = pgm_read_byte(&(bytes[byte_id])); - return byte & (0x1 << bit_pos); + uint8_t the_byte = pgm_read_byte(&(bytes[byte_id])); + return the_byte & (0x1 << bit_pos); } } // end namespace internal