Merge pull request #655 from CapeLeidokos/pr_virtual_build_fix_f1

Fixed a collision of variable named byte
pull/656/head
Jesse Vincent 6 years ago committed by GitHub
commit 3defe2c286
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -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 byte_id = raw_pos >> 3;
uint8_t bit_pos = raw_pos & 0x7; uint8_t bit_pos = raw_pos & 0x7;
const uint8_t *bytes = reinterpret_cast<const uint8_t *>(bit_field); const uint8_t *bytes = reinterpret_cast<const uint8_t *>(bit_field);
uint8_t byte = pgm_read_byte(&(bytes[byte_id])); uint8_t the_byte = pgm_read_byte(&(bytes[byte_id]));
return byte & (0x1 << bit_pos); return the_byte & (0x1 << bit_pos);
} }
} // end namespace internal } // end namespace internal

Loading…
Cancel
Save