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-06-29 12:58:57 +0300
committerDavid Crocker <dcrocker@eschertech.com>2021-06-29 12:58:57 +0300
commit9298f2a4e52d8b011b19331041455a45d57678b6 (patch)
treee60a89f4ef6ed4a75c79adc49250602a386e169a /src/GCodes/GCodes2.cpp
parent60a2067eaac8fa64473c3068caaca5e7902817d7 (diff)
Refactored swap-and-delete operations
Diffstat (limited to 'src/GCodes/GCodes2.cpp')
-rw-r--r--src/GCodes/GCodes2.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/GCodes/GCodes2.cpp b/src/GCodes/GCodes2.cpp
index ed936374..cd8e204b 100644
--- a/src/GCodes/GCodes2.cpp
+++ b/src/GCodes/GCodes2.cpp
@@ -63,8 +63,6 @@
# include <Platform/Logger.h>
#endif
-#include <utility> // for std::swap
-
// If the code to act on is completed, this returns true, otherwise false.
// It is called repeatedly for a given code until it returns true for that code.
bool GCodes::ActOnCode(GCodeBuffer& gb, const StringRef& reply) noexcept
@@ -4322,8 +4320,7 @@ bool GCodes::HandleMcode(GCodeBuffer& gb, const StringRef& reply) THROWS(GCodeEx
// Replace the power fail script atomically
char *newPowerFailScript = new char[powerFailString.strlen() + 1];
strcpy(newPowerFailScript, powerFailString.c_str());
- std::swap(newPowerFailScript, powerFailScript);
- delete[] newPowerFailScript;
+ ReplaceObject(powerFailScript, newPowerFailScript);
reprap.StateUpdated();
}
else if (powerFailScript == nullptr)