From 5859510b54580b6ff3ca2858d3bdbafae780972d Mon Sep 17 00:00:00 2001
From: Shauren <shauren.trinity@gmail.com>
Date: Fri, 17 Jun 2022 15:20:55 +0200
Subject: Core/Utils: Added helper function to make creating unique_ptr with
 custom deleters more convenient

---
 src/common/Utilities/Memory.h             | 49 +++++++++++++++++++++++++++++++
 src/server/game/World/World.cpp           |  2 +-
 src/server/shared/DetourMemoryFunctions.h | 34 +++++++++++++++++++++
 src/server/shared/Memory.h                | 34 ---------------------
 4 files changed, 84 insertions(+), 35 deletions(-)
 create mode 100644 src/common/Utilities/Memory.h
 create mode 100644 src/server/shared/DetourMemoryFunctions.h
 delete mode 100644 src/server/shared/Memory.h

(limited to 'src')

diff --git a/src/common/Utilities/Memory.h b/src/common/Utilities/Memory.h
new file mode 100644
index 00000000000..8d67e802104
--- /dev/null
+++ b/src/common/Utilities/Memory.h
@@ -0,0 +1,49 @@
+/*
+ * This file is part of the TrinityCore Project. See AUTHORS file for Copyright information
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef TRINITY_MEMORY_H
+#define TRINITY_MEMORY_H
+
+#include <memory>
+
+namespace Trinity
+{
+namespace Impl
+{
+template<typename T, typename Del>
+struct unique_ptr_deleter
+{
+    using pointer = T;
+    unique_ptr_deleter(Del deleter) : _deleter(std::move(deleter)) { }
+
+    void operator()(pointer ptr) const { _deleter(ptr); }
+
+private:
+    Del _deleter;
+};
+}
+
+template<typename T, typename Del>
+auto make_unique_ptr_with_deleter(T ptr, Del&& deleter)
+{
+    using Deleter_t = Impl::unique_ptr_deleter<T, Del>;
+
+    return std::unique_ptr<T, Deleter_t>(ptr, Deleter_t(std::forward<Del>(deleter)));
+}
+}
+
+#endif // TRINITY_MEMORY_H
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
index e58ce88ef86..5a3ef8104f3 100644
--- a/src/server/game/World/World.cpp
+++ b/src/server/game/World/World.cpp
@@ -47,6 +47,7 @@
 #include "CreatureTextMgr.h"
 #include "DatabaseEnv.h"
 #include "DB2Stores.h"
+#include "DetourMemoryFunctions.h"
 #include "DisableMgr.h"
 #include "GameEventMgr.h"
 #include "GameObjectModel.h"
@@ -67,7 +68,6 @@
 #include "LootMgr.h"
 #include "M2Stores.h"
 #include "MapManager.h"
-#include "Memory.h"
 #include "Metric.h"
 #include "MiscPackets.h"
 #include "MMapFactory.h"
diff --git a/src/server/shared/DetourMemoryFunctions.h b/src/server/shared/DetourMemoryFunctions.h
new file mode 100644
index 00000000000..972e5eda4b1
--- /dev/null
+++ b/src/server/shared/DetourMemoryFunctions.h
@@ -0,0 +1,34 @@
+/*
+ * This file is part of the TrinityCore Project. See AUTHORS file for Copyright information
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef TRINITY_DETOUR_MEMORY_FUNCTIONS_H
+#define TRINITY_DETOUR_MEMORY_FUNCTIONS_H
+
+#include "DetourAlloc.h"
+
+//  memory management
+inline void* dtCustomAlloc(size_t size, dtAllocHint /*hint*/)
+{
+    return (void*)new unsigned char[size];
+}
+
+inline void dtCustomFree(void* ptr)
+{
+    delete [] (unsigned char*)ptr;
+}
+
+#endif // TRINITY_DETOUR_MEMORY_FUNCTIONS_H
diff --git a/src/server/shared/Memory.h b/src/server/shared/Memory.h
deleted file mode 100644
index c28aec52081..00000000000
--- a/src/server/shared/Memory.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * This file is part of the TrinityCore Project. See AUTHORS file for Copyright information
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef _MEMORY_H
-#define _MEMORY_H
-
-#include "DetourAlloc.h"
-
-//  memory management
-inline void* dtCustomAlloc(size_t size, dtAllocHint /*hint*/)
-{
-    return (void*)new unsigned char[size];
-}
-
-inline void dtCustomFree(void* ptr)
-{
-    delete [] (unsigned char*)ptr;
-}
-
-#endif
-- 
cgit v1.2.3