From 714e34579e0d9e4909cef3b485f0cc1e8a68c054 Mon Sep 17 00:00:00 2001 From: Florian Fleissner Date: Wed, 20 Nov 2019 15:47:55 +0100 Subject: [PATCH] Disambiguated type name and instance name LEDs Signed-off-by: Florian Fleissner --- src/kaleidoscope/device/Base.h | 2 +- src/kaleidoscope/driver/led/Base.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/kaleidoscope/device/Base.h b/src/kaleidoscope/device/Base.h index c965510a..2e7291bd 100644 --- a/src/kaleidoscope/device/Base.h +++ b/src/kaleidoscope/device/Base.h @@ -91,7 +91,7 @@ class Base { static constexpr uint8_t matrix_columns = KeyScannerProps::matrix_columns; static constexpr uint8_t led_count = LEDDriverProps::led_count; static constexpr typename LEDDriver::LEDs &LEDs() { - return LEDDriver::LEDs; + return LEDDriver::LEDs_; } /** diff --git a/src/kaleidoscope/driver/led/Base.h b/src/kaleidoscope/driver/led/Base.h index db82a747..3f5cb8dc 100644 --- a/src/kaleidoscope/driver/led/Base.h +++ b/src/kaleidoscope/driver/led/Base.h @@ -109,7 +109,7 @@ class Base { constexpr bool isValid(uint8_t index) { return (_LEDDriverProps::led_count > 0 && index < _LEDDriverProps::led_count); } - } LEDs; + } LEDs_; protected: typedef _LEDDriverProps Props_;