Fixes for gcc version 10

Also fixed shadow definitions

3 files changed, 3 insertions, 3 deletions

diff --git a/src/Endstops/Endstop.h b/src/Endstops/Endstop.h
index 73f51872..3d288a02 100644
--- a/src/Endstops/Endstop.h
+++ b/src/Endstops/Endstop.h
@@ -105,7 +105,7 @@ public:
 	void SetAtHighEnd(bool b) noexcept { atHighEnd = b; }
 
 protected:
-	Endstop(uint8_t axis, EndStopPosition pos) noexcept;
+	Endstop(uint8_t p_axis, EndStopPosition pos) noexcept;
 
 	DECLARE_OBJECT_MODEL
 
diff --git a/src/Endstops/SwitchEndstop.cpp b/src/Endstops/SwitchEndstop.cpp
index d1615a9a..87af1b9b 100644
--- a/src/Endstops/SwitchEndstop.cpp
+++ b/src/Endstops/SwitchEndstop.cpp
@@ -20,7 +20,7 @@
 #endif
 
 // Switch endstop
-SwitchEndstop::SwitchEndstop(uint8_t axis, EndStopPosition pos) noexcept : Endstop(axis, pos), numPortsUsed(0)
+SwitchEndstop::SwitchEndstop(uint8_t p_axis, EndStopPosition pos) noexcept : Endstop(p_axis, pos), numPortsUsed(0)
 {
 	// ports will be initialised automatically by the IoPort default constructor
 }
diff --git a/src/Endstops/SwitchEndstop.h b/src/Endstops/SwitchEndstop.h
index 75117daf..b2cc997e 100644
--- a/src/Endstops/SwitchEndstop.h
+++ b/src/Endstops/SwitchEndstop.h
@@ -19,7 +19,7 @@ public:
 	void operator delete(void* p) noexcept { FreelistManager::Release<SwitchEndstop>(p); }
 	~SwitchEndstop() noexcept override;
 
-	SwitchEndstop(uint8_t axis, EndStopPosition pos) noexcept;
+	SwitchEndstop(uint8_t p_axis, EndStopPosition pos) noexcept;
 
 	EndStopType GetEndstopType() const noexcept override;
 	EndStopHit Stopped() const noexcept override;