Use new macros in FreelistManager.h

10 files changed, 16 insertions, 23 deletions

diff --git a/src/Endstops/LocalZProbe.h b/src/Endstops/LocalZProbe.h
index 8fef6bc5..a0eb1f5f 100644
--- a/src/Endstops/LocalZProbe.h
+++ b/src/Endstops/LocalZProbe.h
@@ -14,11 +14,11 @@
 class LocalZProbe final : public ZProbe
 {
 public:
-	void* operator new(size_t sz) noexcept { return FreelistManager::Allocate<LocalZProbe>(); }
-	void operator delete(void* p) noexcept { FreelistManager::Release<LocalZProbe>(p); }
+	DECLARE_FREELIST_NEW_DELETE(LocalZProbe)
 
 	LocalZProbe(unsigned int num) noexcept : ZProbe(num, ZProbeType::none) { }
 	~LocalZProbe() noexcept override;
+
 	void SetIREmitter(bool on) const noexcept override;
 	uint16_t GetRawReading() const noexcept override;
 	bool SetProbing(bool isProbing) noexcept override;
diff --git a/src/Endstops/RemoteZProbe.h b/src/Endstops/RemoteZProbe.h
index ca2ae0fe..24715256 100644
--- a/src/Endstops/RemoteZProbe.h
+++ b/src/Endstops/RemoteZProbe.h
@@ -17,11 +17,11 @@
 class RemoteZProbe final : public ZProbe
 {
 public:
-	void* operator new(size_t sz) noexcept { return FreelistManager::Allocate<RemoteZProbe>(); }
-	void operator delete(void* p) noexcept { FreelistManager::Release<RemoteZProbe>(p); }
+	DECLARE_FREELIST_NEW_DELETE(RemoteZProbe)
 
 	RemoteZProbe(unsigned int num, CanAddress bn, ZProbeType p_type) noexcept : ZProbe(num, p_type), boardAddress(bn), state(false) { }
 	~RemoteZProbe() noexcept override;
+
 	void SetIREmitter(bool on) const noexcept override { }
 	uint16_t GetRawReading() const noexcept override;
 	bool SetProbing(bool isProbing) noexcept override;
diff --git a/src/Endstops/StallDetectionEndstop.h b/src/Endstops/StallDetectionEndstop.h
index eb0edd3d..ec037466 100644
--- a/src/Endstops/StallDetectionEndstop.h
+++ b/src/Endstops/StallDetectionEndstop.h
@@ -16,8 +16,7 @@
 class StallDetectionEndstop final : public Endstop
 {
 public:
-	void* operator new(size_t sz) noexcept { return FreelistManager::Allocate<StallDetectionEndstop>(); }
-	void operator delete(void* p) noexcept { FreelistManager::Release<StallDetectionEndstop>(p); }
+	DECLARE_FREELIST_NEW_DELETE(StallDetectionEndstop)
 
 	StallDetectionEndstop(uint8_t p_axis, EndStopPosition pos, bool p_individualMotors) noexcept;		// for creating axis endstops
 	StallDetectionEndstop() noexcept;							// for creating the single extruders endstop
diff --git a/src/Endstops/SwitchEndstop.h b/src/Endstops/SwitchEndstop.h
index eee094e1..cf3a443d 100644
--- a/src/Endstops/SwitchEndstop.h
+++ b/src/Endstops/SwitchEndstop.h
@@ -14,11 +14,10 @@
 class SwitchEndstop : public Endstop
 {
 public:
-	void* operator new(size_t sz) noexcept { return FreelistManager::Allocate<SwitchEndstop>(); }
-	void operator delete(void* p) noexcept { FreelistManager::Release<SwitchEndstop>(p); }
-	~SwitchEndstop() override;
+	DECLARE_FREELIST_NEW_DELETE(SwitchEndstop)
 
 	SwitchEndstop(uint8_t p_axis, EndStopPosition pos) noexcept;
+	~SwitchEndstop() override;
 
 	EndStopType GetEndstopType() const noexcept override;
 	bool Stopped() const noexcept override;
diff --git a/src/Endstops/ZProbe.h b/src/Endstops/ZProbe.h
index 3c45f3ef..552fbb59 100644
--- a/src/Endstops/ZProbe.h
+++ b/src/Endstops/ZProbe.h
@@ -105,11 +105,11 @@ protected:
 class MotorStallZProbe final : public ZProbe
 {
 public:
-	void* operator new(size_t sz) noexcept { return FreelistManager::Allocate<MotorStallZProbe>(); }
-	void operator delete(void* p) noexcept { FreelistManager::Release<MotorStallZProbe>(p); }
+	DECLARE_FREELIST_NEW_DELETE(MotorStallZProbe)
 
 	MotorStallZProbe(unsigned int num) noexcept : ZProbe(num, ZProbeType::zMotorStall) { }
 	~MotorStallZProbe() override { }
+
 	void SetIREmitter(bool on) const noexcept override { }
 	uint16_t GetRawReading() const noexcept override { return 4000; }
 	bool SetProbing(bool isProbing) noexcept override { return true; }
@@ -122,11 +122,11 @@ private:
 class DummyZProbe final : public ZProbe
 {
 public:
-	void* operator new(size_t sz) noexcept { return FreelistManager::Allocate<DummyZProbe>(); }
-	void operator delete(void* p) noexcept { FreelistManager::Release<DummyZProbe>(p); }
+	DECLARE_FREELIST_NEW_DELETE(DummyZProbe)
 
 	DummyZProbe(unsigned int num) noexcept : ZProbe(num, ZProbeType::none) { }
 	~DummyZProbe() noexcept override { }
+
 	void SetIREmitter(bool on) const noexcept override { }
 	uint16_t GetRawReading() const noexcept override { return 4000; }
 	bool SetProbing(bool isProbing) noexcept override { return true; }
diff --git a/src/Endstops/ZProbeEndstop.h b/src/Endstops/ZProbeEndstop.h
index 3a1db7a2..9c4f776c 100644
--- a/src/Endstops/ZProbeEndstop.h
+++ b/src/Endstops/ZProbeEndstop.h
@@ -13,8 +13,7 @@
 class ZProbeEndstop final : public Endstop
 {
 public:
-	void* operator new(size_t sz) noexcept { return FreelistManager::Allocate<ZProbeEndstop>(); }
-	void operator delete(void* p) noexcept { FreelistManager::Release<ZProbeEndstop>(p); }
+	DECLARE_FREELIST_NEW_DELETE(ZProbeEndstop)
 
 	ZProbeEndstop(uint8_t p_axis, EndStopPosition pos) noexcept;
 
diff --git a/src/GCodes/GCodeMachineState.h b/src/GCodes/GCodeMachineState.h
index 6219aa61..8a5b374a 100644
--- a/src/GCodes/GCodeMachineState.h
+++ b/src/GCodes/GCodeMachineState.h
@@ -179,8 +179,7 @@ public:
 		BlockType blockType;										// the type of this block
 	};
 
-	void* operator new(size_t sz) noexcept { return FreelistManager::Allocate<GCodeMachineState>(); }
-	void operator delete(void* p) noexcept { FreelistManager::Release<GCodeMachineState>(p); }
+	DECLARE_FREELIST_NEW_DELETE(GCodeMachineState)
 
 	GCodeMachineState() noexcept;
 	GCodeMachineState(GCodeMachineState&, bool withinSameFile) noexcept;	// this chains the new one to the previous one
diff --git a/src/ObjectModel/Variable.h b/src/ObjectModel/Variable.h
index 2b104608..6f951d04 100644
--- a/src/ObjectModel/Variable.h
+++ b/src/ObjectModel/Variable.h
@@ -57,8 +57,7 @@ public:
 private:
 	struct LinkedVariable
 	{
-		void* operator new(size_t sz) noexcept { return FreelistManager::Allocate<LinkedVariable>(); }
-		void operator delete(void* p) noexcept { FreelistManager::Release<LinkedVariable>(p); }
+		DECLARE_FREELIST_NEW_DELETE(LinkedVariable)
 
 		LinkedVariable(const char *_ecv_array str, ExpressionValue pVal, int8_t pScope, LinkedVariable *p_next) : next(p_next), v(str, pVal, pScope) {}
 
diff --git a/src/Platform/Event.h b/src/Platform/Event.h
index 7e120095..2ef05fd9 100644
--- a/src/Platform/Event.h
+++ b/src/Platform/Event.h
@@ -37,8 +37,7 @@ class CanMessageEvent;
 class Event
 {
 public:
-	void* operator new(size_t sz) noexcept { return FreelistManager::Allocate<Event>(); }
-	void operator delete(void* p) noexcept { FreelistManager::Release<Event>(p); }
+	DECLARE_FREELIST_NEW_DELETE(Event)
 
 	// Get a description of the current event and return the appropriate message type
 	static MessageType GetTextDescription(const StringRef& str) noexcept;
diff --git a/src/Tools/Tool.h b/src/Tools/Tool.h
index f08c8a94..99b0ae3a 100644
--- a/src/Tools/Tool.h
+++ b/src/Tools/Tool.h
@@ -44,8 +44,7 @@ class Tool INHERIT_OBJECT_MODEL
 public:
 	friend class RepRap;
 
-	void* operator new(size_t sz) noexcept { return FreelistManager::Allocate<Tool>(); }
-	void operator delete(void* p) noexcept { FreelistManager::Release<Tool>(p); }
+	DECLARE_FREELIST_NEW_DELETE(Tool)
 
 	~Tool() override { delete name; }