Use function_ref in preference to inplace_function

10 files changed, 24 insertions, 24 deletions

diff --git a/src/CAN/CanInterface.cpp b/src/CAN/CanInterface.cpp
index 34b1edac..5c0a4a96 100644
--- a/src/CAN/CanInterface.cpp
+++ b/src/CAN/CanInterface.cpp
@@ -598,7 +598,7 @@ GCodeResult CanInterface::SendRequestAndGetStandardReply(CanMessageBuffer *buf,
 }
 
 // Send a request to an expansion board and append the response to 'reply'. The response may either be a standard reply or 'replyType'.
-GCodeResult CanInterface::SendRequestAndGetCustomReply(CanMessageBuffer *buf, CanRequestId rid, const StringRef& reply, uint8_t *extra, CanMessageType replyType, stdext::inplace_function<void(const CanMessageBuffer*) /*noexcept*/> callback) noexcept
+GCodeResult CanInterface::SendRequestAndGetCustomReply(CanMessageBuffer *buf, CanRequestId rid, const StringRef& reply, uint8_t *extra, CanMessageType replyType, function_ref<void(const CanMessageBuffer*) /*noexcept*/> callback) noexcept
 {
 	if (can0dev == nullptr)
 	{
diff --git a/src/CAN/CanInterface.h b/src/CAN/CanInterface.h
index d19feef4..50aecfd7 100644
--- a/src/CAN/CanInterface.h
+++ b/src/CAN/CanInterface.h
@@ -74,7 +74,7 @@ namespace CanInterface
 
 	CanRequestId AllocateRequestId(CanAddress destination) noexcept;
 	GCodeResult SendRequestAndGetStandardReply(CanMessageBuffer *buf, CanRequestId rid, const StringRef& reply, uint8_t *extra = nullptr) noexcept;
-	GCodeResult SendRequestAndGetCustomReply(CanMessageBuffer *buf, CanRequestId rid, const StringRef& reply, uint8_t *extra, CanMessageType replyType, stdext::inplace_function<void(const CanMessageBuffer*) /*noexcept*/> callback) noexcept;
+	GCodeResult SendRequestAndGetCustomReply(CanMessageBuffer *buf, CanRequestId rid, const StringRef& reply, uint8_t *extra, CanMessageType replyType, function_ref<void(const CanMessageBuffer*) /*noexcept*/> callback) noexcept;
 	void SendResponseNoFree(CanMessageBuffer *buf) noexcept;
 	void SendBroadcastNoFree(CanMessageBuffer *buf) noexcept;
 	void SendMessageNoReplyNoFree(CanMessageBuffer *buf) noexcept;
diff --git a/src/ObjectModel/Variable.cpp b/src/ObjectModel/Variable.cpp
index 65e6b55f..fd07fee4 100644
--- a/src/ObjectModel/Variable.cpp
+++ b/src/ObjectModel/Variable.cpp
@@ -126,7 +126,7 @@ void VariableSet::AssignFrom(VariableSet& other) noexcept
 	other.root = nullptr;
 }
 
-void VariableSet::IterateWhile(stdext::inplace_function<bool(unsigned int, const Variable&) /*noexcept*/ > func) const noexcept
+void VariableSet::IterateWhile(function_ref<bool(unsigned int, const Variable&) /*noexcept*/ > func) const noexcept
 {
 	unsigned int num = 0;
 	for (const Variable *v = root; v != nullptr; v = v->GetNext())
diff --git a/src/ObjectModel/Variable.h b/src/ObjectModel/Variable.h
index 28717688..164fb2c1 100644
--- a/src/ObjectModel/Variable.h
+++ b/src/ObjectModel/Variable.h
@@ -57,7 +57,7 @@ public:
 	void Delete(const char *str) noexcept;
 	void Clear() noexcept;
 
-	void IterateWhile(stdext::inplace_function<bool(unsigned int index, const Variable& v) /*noexcept*/ > func) const noexcept;
+	void IterateWhile(function_ref<bool(unsigned int index, const Variable& v) /*noexcept*/ > func) const noexcept;
 
 private:
 	Variable *root;
diff --git a/src/Platform/Platform.cpp b/src/Platform/Platform.cpp
index 7122f7a8..3c1c8946 100644
--- a/src/Platform/Platform.cpp
+++ b/src/Platform/Platform.cpp
@@ -2572,7 +2572,7 @@ bool Platform::WriteAxisLimits(FileStore *f, AxesBitmap axesProbed, const float
 #if SUPPORT_CAN_EXPANSION
 
 // Function to identify and iterate through all drivers attached to an axis or extruder
-void Platform::IterateDrivers(size_t axisOrExtruder, stdext::inplace_function<void(uint8_t)> localFunc, stdext::inplace_function<void(DriverId)> remoteFunc) noexcept
+void Platform::IterateDrivers(size_t axisOrExtruder, function_ref<void(uint8_t)> localFunc, function_ref<void(DriverId)> remoteFunc) noexcept
 {
 	if (axisOrExtruder < reprap.GetGCodes().GetTotalAxes())
 	{
@@ -2606,7 +2606,7 @@ void Platform::IterateDrivers(size_t axisOrExtruder, stdext::inplace_function<vo
 #else
 
 // Function to identify and iterate through all drivers attached to an axis or extruder
-void Platform::IterateDrivers(size_t axisOrExtruder, stdext::inplace_function<void(uint8_t)> localFunc) noexcept
+void Platform::IterateDrivers(size_t axisOrExtruder, function_ref<void(uint8_t)> localFunc) noexcept
 {
 	if (axisOrExtruder < reprap.GetGCodes().GetTotalAxes())
 	{
diff --git a/src/Platform/Platform.h b/src/Platform/Platform.h
index dbf122c9..ac73580e 100644
--- a/src/Platform/Platform.h
+++ b/src/Platform/Platform.h
@@ -40,7 +40,7 @@ Licence: GPL
 #include <Comms/AuxDevice.h>
 #include <Comms/PanelDueUpdater.h>
 #include <General/IPAddress.h>
-#include <General/inplace_function.h>
+#include <General/function_ref.h>
 
 #if defined(DUET_NG)
 # include "DueXn.h"
@@ -655,12 +655,12 @@ private:
 	float GetCpuTemperature() const noexcept;
 
 #if SUPPORT_CAN_EXPANSION
-	void IterateDrivers(size_t axisOrExtruder, stdext::inplace_function<void(uint8_t) /*noexcept*/ > localFunc, stdext::inplace_function<void(DriverId) /*noexcept*/ > remoteFunc) noexcept;
-	void IterateLocalDrivers(size_t axisOrExtruder, stdext::inplace_function<void(uint8_t) /*noexcept*/ > func) noexcept { IterateDrivers(axisOrExtruder, func, [](DriverId) noexcept {}); }
-	void IterateRemoteDrivers(size_t axisOrExtruder, stdext::inplace_function<void(DriverId) /*noexcept*/ > func) noexcept { IterateDrivers(axisOrExtruder, [](uint8_t) noexcept {}, func); }
+	void IterateDrivers(size_t axisOrExtruder, function_ref<void(uint8_t) /*noexcept*/ > localFunc, function_ref<void(DriverId) /*noexcept*/ > remoteFunc) noexcept;
+	void IterateLocalDrivers(size_t axisOrExtruder, function_ref<void(uint8_t) /*noexcept*/ > func) noexcept { IterateDrivers(axisOrExtruder, func, [](DriverId) noexcept {}); }
+	void IterateRemoteDrivers(size_t axisOrExtruder, function_ref<void(DriverId) /*noexcept*/ > func) noexcept { IterateDrivers(axisOrExtruder, [](uint8_t) noexcept {}, func); }
 #else
-	void IterateDrivers(size_t axisOrExtruder, stdext::inplace_function<void(uint8_t) /*noexcept*/ > localFunc) noexcept;
-	void IterateLocalDrivers(size_t axisOrExtruder, stdext::inplace_function<void(uint8_t) /*noexcept*/ > func) noexcept { IterateDrivers(axisOrExtruder, func); }
+	void IterateDrivers(size_t axisOrExtruder, function_ref<void(uint8_t) /*noexcept*/ > localFunc) noexcept;
+	void IterateLocalDrivers(size_t axisOrExtruder, function_ref<void(uint8_t) /*noexcept*/ > func) noexcept { IterateDrivers(axisOrExtruder, func); }
 #endif
 
 #if SUPPORT_REMOTE_COMMANDS
diff --git a/src/Platform/RepRap.cpp b/src/Platform/RepRap.cpp
index 79d11b55..48ee430a 100644
--- a/src/Platform/RepRap.cpp
+++ b/src/Platform/RepRap.cpp
@@ -2315,7 +2315,7 @@ GCodeResult RepRap::GetFileInfoResponse(const char *filename, OutputBuffer *&res
 
 // Helper functions to write JSON arrays
 // Append float array using 1 decimal place
-void RepRap::AppendFloatArray(OutputBuffer *buf, const char *name, size_t numValues, stdext::inplace_function<float(size_t)> func, unsigned int numDecimalDigits) noexcept
+void RepRap::AppendFloatArray(OutputBuffer *buf, const char *name, size_t numValues, function_ref<float(size_t)> func, unsigned int numDecimalDigits) noexcept
 {
 	if (name != nullptr)
 	{
@@ -2333,7 +2333,7 @@ void RepRap::AppendFloatArray(OutputBuffer *buf, const char *name, size_t numVal
 	buf->cat(']');
 }
 
-void RepRap::AppendIntArray(OutputBuffer *buf, const char *name, size_t numValues, stdext::inplace_function<int(size_t)> func) noexcept
+void RepRap::AppendIntArray(OutputBuffer *buf, const char *name, size_t numValues, function_ref<int(size_t)> func) noexcept
 {
 	if (name != nullptr)
 	{
@@ -2351,7 +2351,7 @@ void RepRap::AppendIntArray(OutputBuffer *buf, const char *name, size_t numValue
 	buf->cat(']');
 }
 
-void RepRap::AppendStringArray(OutputBuffer *buf, const char *name, size_t numValues, stdext::inplace_function<const char *(size_t)> func) noexcept
+void RepRap::AppendStringArray(OutputBuffer *buf, const char *name, size_t numValues, function_ref<const char *(size_t)> func) noexcept
 {
 	if (name != nullptr)
 	{
diff --git a/src/Platform/RepRap.h b/src/Platform/RepRap.h
index 4f7195f5..80cac81b 100644
--- a/src/Platform/RepRap.h
+++ b/src/Platform/RepRap.h
@@ -24,7 +24,7 @@ Licence: GPL
 #include <RepRapFirmware.h>
 #include <ObjectModel/ObjectModel.h>
 #include <RTOSIface/RTOSIface.h>
-#include <General/inplace_function.h>
+#include <General/function_ref.h>
 #include <ObjectModel/GlobalVariables.h>
 
 #if SUPPORT_CAN_EXPANSION
@@ -216,9 +216,9 @@ protected:
 
 private:
 	static void EncodeString(StringRef& response, const char* src, size_t spaceToLeave, bool allowControlChars = false, char prefix = 0) noexcept;
-	static void AppendFloatArray(OutputBuffer *buf, const char *name, size_t numValues, stdext::inplace_function<float(size_t)> func, unsigned int numDecimalDigits) noexcept;
-	static void AppendIntArray(OutputBuffer *buf, const char *name, size_t numValues, stdext::inplace_function<int(size_t)> func) noexcept;
-	static void AppendStringArray(OutputBuffer *buf, const char *name, size_t numValues, stdext::inplace_function<const char *(size_t)> func) noexcept;
+	static void AppendFloatArray(OutputBuffer *buf, const char *name, size_t numValues, function_ref<float(size_t)> func, unsigned int numDecimalDigits) noexcept;
+	static void AppendIntArray(OutputBuffer *buf, const char *name, size_t numValues, function_ref<int(size_t)> func) noexcept;
+	static void AppendStringArray(OutputBuffer *buf, const char *name, size_t numValues, function_ref<const char *(size_t)> func) noexcept;
 
 	size_t GetStatusIndex() const noexcept;
 	char GetStatusCharacter() const noexcept;
diff --git a/src/Tools/Tool.cpp b/src/Tools/Tool.cpp
index 6806207a..8e92c31f 100644
--- a/src/Tools/Tool.cpp
+++ b/src/Tools/Tool.cpp
@@ -718,7 +718,7 @@ void Tool::SetSpindleRpm(uint32_t rpm) THROWS(GCodeException)
 	}
 }
 
-void Tool::IterateExtruders(stdext::inplace_function<void(unsigned int)> f) const noexcept
+void Tool::IterateExtruders(function_ref<void(unsigned int)> f) const noexcept
 {
 	for (size_t i = 0; i < driveCount; ++i)
 	{
@@ -726,7 +726,7 @@ void Tool::IterateExtruders(stdext::inplace_function<void(unsigned int)> f) cons
 	}
 }
 
-void Tool::IterateHeaters(stdext::inplace_function<void(int)> f) const noexcept
+void Tool::IterateHeaters(function_ref<void(int)> f) const noexcept
 {
 	for (size_t i = 0; i < heaterCount; ++i)
 	{
diff --git a/src/Tools/Tool.h b/src/Tools/Tool.h
index 6c8f01a0..a12356ef 100644
--- a/src/Tools/Tool.h
+++ b/src/Tools/Tool.h
@@ -31,7 +31,7 @@ Licence: GPL
 #include <ObjectModel/ObjectModel.h>
 #include <General/FreelistManager.h>
 #include <General/NamedEnum.h>
-#include <General/inplace_function.h>
+#include <General/function_ref.h>
 
 constexpr size_t ToolNameLength = 32;						// maximum allowed length for tool names
 
@@ -110,8 +110,8 @@ public:
 
 	bool HasTemperatureFault() const noexcept { return heaterFault; }
 
-	void IterateExtruders(stdext::inplace_function<void(unsigned int)> f) const noexcept;
-	void IterateHeaters(stdext::inplace_function<void(int)> f) const noexcept;
+	void IterateExtruders(function_ref<void(unsigned int)> f) const noexcept;
+	void IterateHeaters(function_ref<void(int)> f) const noexcept;
 	bool UsesHeater(int8_t heater) const noexcept;
 
 	void SetFansPwm(float f) const noexcept;