From bb8b6a3f68885117a740d86e7787a18937b052c8 Mon Sep 17 00:00:00 2001
From: Ted John <ted@brambles.org>
Date: Wed, 31 Jan 2018 13:08:42 +0000
Subject: [PATCH] Replace Memory::Move with std::copy

---
 src/openrct2/core/Memory.hpp  | 11 -----------
 src/openrct2/core/String.cpp  |  2 +-
 src/openrct2/ride/Vehicle.cpp |  2 +-
 3 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/openrct2/core/Memory.hpp b/src/openrct2/core/Memory.hpp
index 8519a63de5..592485e0b1 100644
--- a/src/openrct2/core/Memory.hpp
+++ b/src/openrct2/core/Memory.hpp
@@ -102,17 +102,6 @@ namespace Memory
         return (T*)memcpy((void*)dst, (const void*)src, size);
     }
 
-    template<typename T>
-    static T * Move(T * dst, const T * src, size_t size)
-    {
-        if (size == 0) return (T*)dst;
-        Guard::ArgumentNotNull(dst, "Trying to move memory to nullptr");
-        Guard::ArgumentNotNull(src, "Trying to move memory from nullptr");
-        T* result =(T*)memmove((void*)dst, (const void*)src, size);
-        Guard::ArgumentNotNull(result, "Failed to move %u bytes of memory from %x to %x for %s", size, src, dst, typeid(T).name());
-        return result;
-    }
-
     template<typename T>
     static T * Duplicate(const T * src, size_t size)
     {
diff --git a/src/openrct2/core/String.cpp b/src/openrct2/core/String.cpp
index d4cd9bf831..01659e060b 100644
--- a/src/openrct2/core/String.cpp
+++ b/src/openrct2/core/String.cpp
@@ -484,7 +484,7 @@ namespace String
             Guard::Assert(newStringSize < currentStringSize, GUARD_LINE);
 #endif
 
-            Memory::Move(str, firstNonWhitespace, newStringSize);
+            std::memmove(str, firstNonWhitespace, newStringSize);
             str[newStringSize] = '\0';
         }
         else
diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp
index 68b5ac224c..33d4a38433 100644
--- a/src/openrct2/ride/Vehicle.cpp
+++ b/src/openrct2/ride/Vehicle.cpp
@@ -925,7 +925,7 @@ static void vehicle_update_sound_params(rct_vehicle * vehicle)
     // Shift all sound params down one if using a free space
     if (soundParam != gVehicleSoundParamsListEnd)
     {
-        Memory::Move<rct_vehicle_sound_params>(
+        std::memmove(
             soundParam + 1,
             soundParam,
             ((gVehicleSoundParamsListEnd - soundParam) - 1) * sizeof(rct_vehicle_sound_params));