Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-18 00:18:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Dep/Boost: Drop windows boost hacks (#29358)

Browse Source 
(cherry picked from commit 17c69368a3)
This commit is contained in:
funjoker
2023-10-13 21:10:01 +02:00
committed by Shauren
parent e1306ddfa9
commit ad44ddab34
6 changed files with 1 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dep/boost/CMakeLists.txt
View File

@@ -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()

30
src/common/Hacks/boost_1_73_process_windows_nopch.h
View File

@@ -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 <http://www.gnu.org/licenses/>.
*/
#ifndef boost_1_73_process_windows_nopch_h__
#define boost_1_73_process_windows_nopch_h__
#include "CompilerDefs.h"
#include <boost/version.hpp>
#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 <windows.h>
#endif
#endif // boost_1_73_process_windows_nopch_h__

61
src/common/Hacks/boost_1_74_fibonacci_heap.h
View File

@@ -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 <http://www.gnu.org/licenses/>.
*/
#ifndef HACKS_boost_1_74_fibonacci_heap_h__
#define HACKS_boost_1_74_fibonacci_heap_h__
#include "CompilerDefs.h"
#include <boost/version.hpp>
#if TRINITY_COMPILER == TRINITY_COMPILER_MICROSOFT && BOOST_VERSION == 107400
#define BOOST_1_74_FIBONACCI_HEAP_MSVC_COMPILE_FIX(T) \
namespace boost::heap::detail \
{ \
template<class Node> \
void destroy_node(Node& node) \
{ \
node.~Node(); \
} \
\
template <> \
struct node_disposer<boost::heap::detail::heap_node<T, true>, \
boost::heap::detail::heap_node_base<false>, \
std::allocator<boost::heap::detail::marked_heap_node<T>>> \
{ \
using allocator = std::allocator<boost::heap::detail::marked_heap_node<T>>; \
using node_pointer = typename boost::allocator_pointer<allocator>::type; \
\
node_disposer(allocator& alloc) : _alloc(alloc) \
{ \
} \
\
void operator()(boost::heap::detail::heap_node_base<false>* base) \
{ \
node_pointer n = static_cast<node_pointer>(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__

2
src/common/Utilities/StartProcess.cpp
View File

@@ -20,8 +20,6 @@
#include "Log.h"
#include "Optional.h"
#include "Hacks/boost_1_73_process_windows_nopch.h"
#include <boost/algorithm/string/join.hpp>
#include <boost/iostreams/copy.hpp>
#include <boost/process/args.hpp>

4
src/server/game/Combat/ThreatManager.cpp
View File

@@ -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)

4
src/server/game/Maps/Map.cpp
View File

@@ -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) { }