diff options
| -rw-r--r-- | src/common/Utilities/Memory.h | 49 | ||||
| -rw-r--r-- | src/server/game/World/World.cpp | 2 | ||||
| -rw-r--r-- | src/server/shared/DetourMemoryFunctions.h (renamed from src/server/shared/Memory.h) | 6 |
3 files changed, 53 insertions, 4 deletions
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/Memory.h b/src/server/shared/DetourMemoryFunctions.h index c28aec52081..972e5eda4b1 100644 --- a/src/server/shared/Memory.h +++ b/src/server/shared/DetourMemoryFunctions.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _MEMORY_H -#define _MEMORY_H +#ifndef TRINITY_DETOUR_MEMORY_FUNCTIONS_H +#define TRINITY_DETOUR_MEMORY_FUNCTIONS_H #include "DetourAlloc.h" @@ -31,4 +31,4 @@ inline void dtCustomFree(void* ptr) delete [] (unsigned char*)ptr; } -#endif +#endif // TRINITY_DETOUR_MEMORY_FUNCTIONS_H |