diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Combat/ThreatManager.cpp | 3 | ||||
| -rw-r--r-- | src/server/game/Maps/Map.cpp | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/server/game/Combat/ThreatManager.cpp b/src/server/game/Combat/ThreatManager.cpp index 81640f2eca3..bc1fe368316 100644 --- a/src/server/game/Combat/ThreatManager.cpp +++ b/src/server/game/Combat/ThreatManager.cpp @@ -29,7 +29,6 @@ #include <boost/heap/fibonacci_heap.hpp> #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; @@ -37,6 +36,8 @@ class ThreatManager::Heap : public boost::heap::fibonacci_heap<ThreatReference c { }; +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 f4b6e27db81..2836fc423d8 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -66,7 +66,6 @@ #include <sstream> #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 @@ -81,6 +80,9 @@ struct RespawnInfoWithHandle; struct RespawnListContainer : boost::heap::fibonacci_heap<RespawnInfoWithHandle*, boost::heap::compare<CompareRespawnInfo>> { }; + +BOOST_1_74_FIBONACCI_HEAP_MSVC_COMPILE_FIX(RespawnListContainer::value_type) + struct RespawnInfoWithHandle : RespawnInfo { explicit RespawnInfoWithHandle(RespawnInfo const& other) : RespawnInfo(other) { } |