From ad44ddab347374fee00a7921dc7641adbb099820 Mon Sep 17 00:00:00 2001 From: funjoker Date: Fri, 13 Oct 2023 21:10:01 +0200 Subject: Dep/Boost: Drop windows boost hacks (#29358) (cherry picked from commit 17c69368a351bcea8cd59e1969fbc4999ef88201) --- dep/boost/CMakeLists.txt | 2 +- .../Hacks/boost_1_73_process_windows_nopch.h | 30 ----------- src/common/Hacks/boost_1_74_fibonacci_heap.h | 61 ---------------------- src/common/Utilities/StartProcess.cpp | 2 - src/server/game/Combat/ThreatManager.cpp | 4 -- src/server/game/Maps/Map.cpp | 4 -- 6 files changed, 1 insertion(+), 102 deletions(-) delete mode 100644 src/common/Hacks/boost_1_73_process_windows_nopch.h delete mode 100644 src/common/Hacks/boost_1_74_fibonacci_heap.h diff --git a/dep/boost/CMakeLists.txt b/dep/boost/CMakeLists.txt index d3149e956be..2dae771c95a 100644 --- a/dep/boost/CMakeLists.txt +++ b/dep/boost/CMakeLists.txt @@ -24,7 +24,7 @@ include (CheckCXXSourceCompiles) if (WIN32) # On windows the requirements are higher according to the wiki. - set(BOOST_REQUIRED_VERSION 1.73) + set(BOOST_REQUIRED_VERSION 1.78) else() set(BOOST_REQUIRED_VERSION 1.71) endif() 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 aef7183dd82..00000000000 --- 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 0ebf69cdde3..00000000000 --- 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 5b4071c9eef..37c41f73a95 100644 --- a/src/common/Utilities/StartProcess.cpp +++ b/src/common/Utilities/StartProcess.cpp @@ -20,8 +20,6 @@ #include "Log.h" #include "Optional.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 1789341bac0..50ad9a8e673 100644 --- a/src/server/game/Combat/ThreatManager.cpp +++ b/src/server/game/Combat/ThreatManager.cpp @@ -34,16 +34,12 @@ #include #include -#include "Hacks/boost_1_74_fibonacci_heap.h" - const CompareThreatLessThan ThreatManager::CompareThreat; class ThreatManager::Heap : public boost::heap::fibonacci_heap> { }; -BOOST_1_74_FIBONACCI_HEAP_MSVC_COMPILE_FIX(ThreatManager::Heap::value_type) - void ThreatReference::AddThreat(float amount) { if (amount == 0.0f) diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index 9072158689b..e58d4e17a5d 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -52,8 +52,6 @@ #include #include -#include "Hacks/boost_1_74_fibonacci_heap.h" - u_map_magic MapMagic = { {'M','A','P','S'} }; uint32 MapVersionMagic = 10; u_map_magic MapAreaMagic = { {'A','R','E','A'} }; @@ -79,8 +77,6 @@ struct RespawnListContainer : boost::heap::fibonacci_heap