Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Duet3D/RepRapFirmware.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Crocker <dcrocker@eschertech.com>2021-01-09 18:24:16 +0300
committerDavid Crocker <dcrocker@eschertech.com>2021-01-09 18:24:16 +0300
commit277977b60b2b1349578863dd16e4095121d6c749 (patch)
tree8685eccfded96c9da76d6ecbc138b33df6bc9bbd /src/Display
parent6bb2ddc8936d1352e5a5146f20c86fa388076f68 (diff)
Fixes for gcc version 10
Also fixed shadow definitions
Diffstat (limited to 'src/Display')
-rw-r--r--src/Display/MenuItem.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Display/MenuItem.cpp b/src/Display/MenuItem.cpp
index a1925a4f..f245b8f5 100644
--- a/src/Display/MenuItem.cpp
+++ b/src/Display/MenuItem.cpp
@@ -509,7 +509,7 @@ bool ValueMenuItem::Adjust_SelectHelper() noexcept
{
const unsigned int itemNumber = GetReferencedToolNumber();
- bool error = false;
+ bool err = false;
switch (valIndex/100)
{
case 1: // heater active temperature
@@ -561,17 +561,17 @@ bool ValueMenuItem::Adjust_SelectHelper() noexcept
break;
default:
- error = true;
+ err = true;
break;
}
break;
default:
- error = true;
+ err = true;
break;
}
- if (error)
+ if (err)
{
reprap.GetDisplay().ErrorBeep();
}