0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed patched boost::bind (#5339)

Browse source 
This seemed to be a patch for older compilers (GCC 4.8/4.9, see 3c56630b54)
which we no longer support.
This commit is contained in:
Charles Dang 2020-12-04 11:45:16 +11:00 • committed by GitHub
parent 2371b8af60
commit 23d1db043f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 102 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
projectfiles/VC16/wesnoth.vcxproj
View file

@ -130,7 +130,7 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<DisableSpecificWarnings>4503;4351;4250;4244;4127;4512;4003;4068;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<ForcedIncludeFiles>boost-patched/bind/arg.hpp;%(ForcedIncludeFiles)</ForcedIncludeFiles>
<ForcedIncludeFiles>%(ForcedIncludeFiles)</ForcedIncludeFiles>
<TreatSpecificWarningsAsErrors>4239</TreatSpecificWarningsAsErrors>
<LanguageStandard>stdcpp17</LanguageStandard>
<AdditionalOptions>/utf-8 /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
@ -169,7 +169,7 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<DisableSpecificWarnings>4503;4351;4250;4244;4267</DisableSpecificWarnings>
<ForcedIncludeFiles>boost-patched/bind/arg.hpp;%(ForcedIncludeFiles)</ForcedIncludeFiles>
<ForcedIncludeFiles>%(ForcedIncludeFiles)</ForcedIncludeFiles>
<TreatSpecificWarningsAsErrors>4239</TreatSpecificWarningsAsErrors>
<AdditionalOptions>/utf-8 /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<LanguageStandard>stdcpp17</LanguageStandard>
@ -210,7 +210,7 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<DisableSpecificWarnings>4503;4351;4250;4244;4127;4512;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<ForcedIncludeFiles>boost-patched/bind/arg.hpp;%(ForcedIncludeFiles)</ForcedIncludeFiles>
<ForcedIncludeFiles>%(ForcedIncludeFiles)</ForcedIncludeFiles>
<TreatSpecificWarningsAsErrors>4239</TreatSpecificWarningsAsErrors>
<LanguageStandard>stdcpp17</LanguageStandard>
<AdditionalOptions>/utf-8 /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
@ -248,7 +248,7 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<DisableSpecificWarnings>4503;4351;4250;4244;</DisableSpecificWarnings>
<ForcedIncludeFiles>boost-patched/bind/arg.hpp;%(ForcedIncludeFiles)</ForcedIncludeFiles>
<ForcedIncludeFiles>%(ForcedIncludeFiles)</ForcedIncludeFiles>
<TreatSpecificWarningsAsErrors>4239</TreatSpecificWarningsAsErrors>
<LanguageStandard>stdcpp17</LanguageStandard>
<AdditionalOptions>/utf-8 /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
@ -292,7 +292,7 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<DisableSpecificWarnings>4503;4351;4250;4244;</DisableSpecificWarnings>
<ForcedIncludeFiles>boost-patched/bind/arg.hpp;%(ForcedIncludeFiles)</ForcedIncludeFiles>
<ForcedIncludeFiles>%(ForcedIncludeFiles)</ForcedIncludeFiles>
<TreatSpecificWarningsAsErrors>4239</TreatSpecificWarningsAsErrors>
<LanguageStandard>stdcpp17</LanguageStandard>
<AdditionalOptions>/utf-8 /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>

6
projectfiles/VC16/wesnothd.vcxproj
View file

@ -150,7 +150,7 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<DisableSpecificWarnings>4503;4244;4127;4512;4003;4068;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<ForcedIncludeFiles>boost-patched/bind/arg.hpp;%(ForcedIncludeFiles)</ForcedIncludeFiles>
<ForcedIncludeFiles>%(ForcedIncludeFiles)</ForcedIncludeFiles>
<LanguageStandard>stdcpp17</LanguageStandard>
<AdditionalOptions>/utf-8 /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
@ -203,7 +203,7 @@
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<DisableSpecificWarnings>4503;4244;</DisableSpecificWarnings>
<ForcedIncludeFiles>boost-patched/bind/arg.hpp;%(ForcedIncludeFiles)</ForcedIncludeFiles>
<ForcedIncludeFiles>%(ForcedIncludeFiles)</ForcedIncludeFiles>
<LanguageStandard>stdcpp17</LanguageStandard>
<AdditionalOptions>/utf-8 /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
@ -259,7 +259,7 @@
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<DisableSpecificWarnings>4503;4244;</DisableSpecificWarnings>
<ForcedIncludeFiles>boost-patched/bind/arg.hpp;%(ForcedIncludeFiles)</ForcedIncludeFiles>
<ForcedIncludeFiles>%(ForcedIncludeFiles)</ForcedIncludeFiles>
<LanguageStandard>stdcpp17</LanguageStandard>
<AdditionalOptions>/utf-8 /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
</ClCompile>

6
projectfiles/VC16/wesnothlib.vcxproj
View file

@ -119,7 +119,7 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<DisableSpecificWarnings>4503;4351;4244;4127;4512;4003;4068;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<ForcedIncludeFiles>boost-patched/bind/arg.hpp;%(ForcedIncludeFiles)</ForcedIncludeFiles>
<ForcedIncludeFiles>%(ForcedIncludeFiles)</ForcedIncludeFiles>
<LanguageStandard>stdcpp17</LanguageStandard>
<AdditionalOptions>/utf-8 /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
@ -164,7 +164,7 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<DisableSpecificWarnings>4503;4351;4244;</DisableSpecificWarnings>
<ForcedIncludeFiles>boost-patched/bind/arg.hpp;%(ForcedIncludeFiles)</ForcedIncludeFiles>
<ForcedIncludeFiles>%(ForcedIncludeFiles)</ForcedIncludeFiles>
<LanguageStandard>stdcpp17</LanguageStandard>
<AdditionalOptions>/utf-8 /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
@ -210,7 +210,7 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<DisableSpecificWarnings>4503;4351;4244;</DisableSpecificWarnings>
<ForcedIncludeFiles>boost-patched/bind/arg.hpp;%(ForcedIncludeFiles)</ForcedIncludeFiles>
<ForcedIncludeFiles>%(ForcedIncludeFiles)</ForcedIncludeFiles>
<LanguageStandard>stdcpp17</LanguageStandard>
<AdditionalOptions>/utf-8 /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
</ClCompile>

3
src/CMakeLists.txt
View file

@ -1,6 +1,3 @@
set(CXX_FLAGS_PROJECT "${CXX_FLAGS_PROJECT} -include boost-patched/bind/arg.hpp")
# store the specified sources list in the specified variable
function(GetSources source_list store_in_var)
file(STRINGS "../source_lists/${source_list}" sources)

4
src/SConscript
View file

@ -56,10 +56,6 @@ for environ in [test_env, client_env, env]:
if not os.path.isabs(env['default_prefs_file']):
environ.Append(CPPDEFINES = "HAS_RELATIVE_DEFPREF")
# Inject boost::bind patch everywhere
for environ in [test_env, client_env, env]:
environ.Append(CCFLAGS = Split("-include boost-patched/bind/arg.hpp"))
for environ in [test_env, client_env, env]:
environ.Append(CPPDEFINES = "$EXTRA_DEFINE")

84
src/boost-patched/bind/arg.hpp
View file

@ -1,84 +0,0 @@
#ifdef __cplusplus
#include <boost/version.hpp>
#if (BOOST_VERSION >= 106000) && (BOOST_VERSION <= 106200)
#ifndef BOOST_BIND_ARG_HPP_INCLUDED
#define BOOST_BIND_ARG_HPP_INCLUDED
/*
** See https://svn.boost.org/trac/boost/ticket/12397
** Patch applied https://github.com/boostorg/bind/commit/3c56630b5400c43d1a4393d685a407e68a69ce9e
** GL 2016-10-12
*/
// MS compatible compilers support #pragma once
#if defined(_MSC_VER) && (_MSC_VER >= 1020)
# pragma once
#endif
//
// bind/arg.hpp
//
// Copyright (c) 2002 Peter Dimov and Multi Media Ltd.
//
// Distributed under the Boost Software License, Version 1.0. (See
// accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
//
// See http://www.boost.org/libs/bind/bind.html for documentation.
//
#include <boost/config.hpp>
#include <boost/is_placeholder.hpp>
namespace boost
{
template< int I, int J > struct _arg_eq
{
};
template< int I > struct _arg_eq< I, I>
{
typedef void type;
};
template< int I > struct arg
{
BOOST_CONSTEXPR arg()
{
}
template< class T > BOOST_CONSTEXPR arg( T const & /* t */, typename _arg_eq< I, is_placeholder<T>::value >::type * = 0 )
{
}
};
template< int I > BOOST_CONSTEXPR bool operator==( arg<I> const &, arg<I> const & )
{
return true;
}
#if !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION )
template< int I > struct is_placeholder< arg<I>>
{
enum _vt { value = I };
};
template< int I > struct is_placeholder< arg<I> (*) () >
{
enum _vt { value = I };
};
#endif
} // namespace boost
#endif // #ifndef BOOST_BIND_ARG_HPP_INCLUDED
#endif // BOOST_VERSION checks
#endif // __cplusplus