mirror of
https://github.com/letscontrolit/ESPEasy.git
synced 2026-09-11 09:04:53 +00:00
[Storage] Fix merge error
This commit is contained in:
@@ -190,10 +190,8 @@ void run_compiletime_checks() {
|
||||
// to determine nr of bits in a struct.
|
||||
static_assert(GPIO_DIRECTION_NR_BITS== NR_BITS(static_cast<uint8_t>(gpio_direction::gpio_direction_MAX)), "Correct GPIO_DIRECTION_NR_BITS");
|
||||
|
||||
#endif // ifndef LIMIT_BUILD_SIZE
|
||||
}
|
||||
|
||||
#ifndef LIMIT_BUILD_SIZE
|
||||
String ReportOffsetErrorInStruct(const String& structname, size_t offset) {
|
||||
String error;
|
||||
if (error.reserve(48 + structname.length())) {
|
||||
@@ -271,4 +269,4 @@ String checkTaskSettings(taskIndex_t taskIndex) {
|
||||
#endif
|
||||
return err;
|
||||
}
|
||||
#endif
|
||||
#endif // ifndef LIMIT_BUILD_SIZE
|
||||
|
||||
Reference in New Issue
Block a user