diff options
| author | funjoker <funjoker109@gmail.com> | 2023-10-13 21:10:01 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2024-02-26 12:29:16 +0100 |
| commit | ad44ddab347374fee00a7921dc7641adbb099820 (patch) | |
| tree | f1f77de14fb595d449cad568d4c46e472160a6c6 /src/server/game | |
| parent | e1306ddfa9476516c59792368f5e5c1ef16aef80 (diff) | |
Dep/Boost: Drop windows boost hacks (#29358)
(cherry picked from commit 17c69368a351bcea8cd59e1969fbc4999ef88201)
Diffstat (limited to 'src/server/game')
| -rw-r--r-- | src/server/game/Combat/ThreatManager.cpp | 4 | ||||
| -rw-r--r-- | src/server/game/Maps/Map.cpp | 4 |
2 files changed, 0 insertions, 8 deletions
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 <algorithm> #include <boost/heap/fibonacci_heap.hpp> -#include "Hacks/boost_1_74_fibonacci_heap.h" - const CompareThreatLessThan ThreatManager::CompareThreat; class ThreatManager::Heap : public boost::heap::fibonacci_heap<ThreatReference const*, boost::heap::compare<CompareThreatLessThan>> { }; -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 <unordered_set> #include <vector> -#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<RespawnInfoWithHandle* { }; -BOOST_1_74_FIBONACCI_HEAP_MSVC_COMPILE_FIX(RespawnListContainer::value_type) - struct RespawnInfoWithHandle : RespawnInfo { explicit RespawnInfoWithHandle(RespawnInfo const& other) : RespawnInfo(other) { } |
