diff --git a/src/common/Hacks/boost_1_73_process_windows_nopch.h b/src/common/Hacks/boost_1_73_process_windows_nopch.h deleted file mode 100644 index aef7183dd8..0000000000 --- a/src/common/Hacks/boost_1_73_process_windows_nopch.h +++ /dev/null @@ -1,30 +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 . - */ - -#ifndef boost_1_73_process_windows_nopch_h__ -#define boost_1_73_process_windows_nopch_h__ - -#include "CompilerDefs.h" -#include - -#if TRINITY_PLATFORM == TRINITY_PLATFORM_WINDOWS && BOOST_VERSION >= 107300 && BOOST_VERSION < 107800 -// __kernel_entry for boost/process/detail/windows/handle_workaround.hpp -// DWORD for boost/process/detail/windows/handles.hpp -#include -#endif - -#endif // boost_1_73_process_windows_nopch_h__ diff --git a/src/common/Hacks/boost_1_74_fibonacci_heap.h b/src/common/Hacks/boost_1_74_fibonacci_heap.h deleted file mode 100644 index 0ebf69cdde..0000000000 --- a/src/common/Hacks/boost_1_74_fibonacci_heap.h +++ /dev/null @@ -1,61 +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 . - */ - -#ifndef HACKS_boost_1_74_fibonacci_heap_h__ -#define HACKS_boost_1_74_fibonacci_heap_h__ - -#include "CompilerDefs.h" -#include - -#if TRINITY_COMPILER == TRINITY_COMPILER_MICROSOFT && BOOST_VERSION == 107400 -#define BOOST_1_74_FIBONACCI_HEAP_MSVC_COMPILE_FIX(T) \ -namespace boost::heap::detail \ -{ \ - template \ - void destroy_node(Node& node) \ - { \ - node.~Node(); \ - } \ - \ - template <> \ - struct node_disposer, \ - boost::heap::detail::heap_node_base, \ - std::allocator>> \ - { \ - using allocator = std::allocator>; \ - using node_pointer = typename boost::allocator_pointer::type; \ - \ - node_disposer(allocator& alloc) : _alloc(alloc) \ - { \ - } \ - \ - void operator()(boost::heap::detail::heap_node_base* base) \ - { \ - node_pointer n = static_cast(base); \ - n->clear_subtree(_alloc); \ - destroy_node(*n); /* <- the change compared to default implementation */ \ - _alloc.deallocate(n, 1); \ - } \ - \ - allocator& _alloc; \ - }; \ -} -#else -#define BOOST_1_74_FIBONACCI_HEAP_MSVC_COMPILE_FIX(T) -#endif - -#endif // HACKS_boost_1_74_fibonacci_heap_h__ diff --git a/src/common/Utilities/StartProcess.cpp b/src/common/Utilities/StartProcess.cpp index 98cb54f12e..aa12ef7564 100644 --- a/src/common/Utilities/StartProcess.cpp +++ b/src/common/Utilities/StartProcess.cpp @@ -21,8 +21,6 @@ #include "Optional.h" #include "Util.h" -#include "Hacks/boost_1_73_process_windows_nopch.h" - #include #include #include diff --git a/src/server/game/Combat/ThreatManager.cpp b/src/server/game/Combat/ThreatManager.cpp index dbacfa8c66..1f15dee576 100644 --- a/src/server/game/Combat/ThreatManager.cpp +++ b/src/server/game/Combat/ThreatManager.cpp @@ -33,9 +33,6 @@ #include "WorldPacket.h" #include -#include "Hacks/boost_1_74_fibonacci_heap.h" -BOOST_1_74_FIBONACCI_HEAP_MSVC_COMPILE_FIX(ThreatManager::threat_list_heap::value_type) - const CompareThreatLessThan ThreatManager::CompareThreat; void ThreatReference::AddThreat(float amount) diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index b2da70f46b..add7ce6f15 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -56,9 +56,6 @@ #include #include -#include "Hacks/boost_1_74_fibonacci_heap.h" -BOOST_1_74_FIBONACCI_HEAP_MSVC_COMPILE_FIX(RespawnListContainer::value_type) - #define DEFAULT_GRID_EXPIRY 300 #define MAX_GRID_LOAD_TIME 50 #define MAX_CREATURE_ATTACK_RADIUS (45.0f * sWorld->getRate(RATE_CREATURE_AGGRO))