Let's try that again

pull/911/head
Jesse Vincent 4 years ago committed by Gergely Nagy
parent 2baef3e871
commit 58146b8f45
No known key found for this signature in database
GPG Key ID: AC1E90BAC433F68F

@ -47,7 +47,7 @@ class MatrixAddr {
constexpr MatrixAddr(uint8_t row, uint8_t col) constexpr MatrixAddr(uint8_t row, uint8_t col)
: offset_(row * cols + col) {} : offset_(row * cols + col) {}
explicit constexpr MatrixAddr(uint8_t offset) constexpr MatrixAddr(uint8_t offset)
: offset_(offset) {} : offset_(offset) {}
// Rely on the default copy and move constructor. // Rely on the default copy and move constructor.
@ -57,8 +57,8 @@ class MatrixAddr {
// ridiculously bad assembler code for each copy construction, // ridiculously bad assembler code for each copy construction,
// that would bloat the default firmware by 1K of PROGMEM! // that would bloat the default firmware by 1K of PROGMEM!
// //
explicit constexpr MatrixAddr(const ThisType &other) = default; constexpr MatrixAddr(const ThisType &other) = default;
explicit constexpr MatrixAddr(ThisType &&other) = default; constexpr MatrixAddr(ThisType &&other) = default;
//constexpr MatrixAddr(const ThisType &other) : offset_(other.offset_) {} //constexpr MatrixAddr(const ThisType &other) : offset_(other.offset_) {}
//constexpr MatrixAddr(ThisType &&other) : offset_(other.offset_) {} //constexpr MatrixAddr(ThisType &&other) : offset_(other.offset_) {}

@ -113,7 +113,7 @@ class Bitfield : public internal::_BaseBitfield {
static constexpr size_t n_bytes_ = nBytesForBits(BitCount__); static constexpr size_t n_bytes_ = nBytesForBits(BitCount__);
template<typename ... Bits__> template<typename ... Bits__>
explicit constexpr Bitfield(Bits__...bits) : bits_(bits...) { constexpr Bitfield(Bits__...bits) : bits_(bits...) {
static_assert(sizeof...(Bits__) == n_bits_, static_assert(sizeof...(Bits__) == n_bits_,
"Invalid number of bits supplied to Bitfield<BitCount__> constructor. \n" "Invalid number of bits supplied to Bitfield<BitCount__> constructor. \n"
"Compare the number of bits supplied with the provided template \n" "Compare the number of bits supplied with the provided template \n"

@ -36,7 +36,7 @@ class Key {
Key() = default; Key() = default;
explicit constexpr Key(uint16_t raw) constexpr Key(uint16_t raw)
: Key{(uint8_t)(raw & 0x00FF), (uint8_t)(raw >> 8)} : Key{(uint8_t)(raw & 0x00FF), (uint8_t)(raw >> 8)}
{} {}
@ -140,7 +140,7 @@ class Key {
DataProxy() = default; DataProxy() = default;
explicit constexpr DataProxy(uint8_t value) : value_{value} {} constexpr DataProxy(uint8_t value) : value_{value} {}
DEPRECATED(DIRECT_KEY_MEMBER_ACCESS) DEPRECATED(DIRECT_KEY_MEMBER_ACCESS)
DataProxy &operator=(uint8_t value) { DataProxy &operator=(uint8_t value) {

Loading…
Cancel
Save