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) --- src/server/game/Combat/ThreatManager.cpp | 4 ---- src/server/game/Maps/Map.cpp | 4 ---- 2 files changed, 8 deletions(-) (limited to 'src/server/game') 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