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

Fix #3926: SCons Boost test fails with -Werror=return-type

Browse source 
Based on the patch from @viy2 with a minor change.
This commit is contained in:
Jyrki Vesterinen 2019-02-12 19:06:46 +02:00
parent 58d44284e0
commit 98fdc8d245
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
scons/boost.py
View file

@ -102,6 +102,7 @@ def CheckBoost(context, boost_lib, require_version = None, header_only = False):
test_program += """
boost::unit_test::test_suite* init_unit_test_suite ( int, char**)
{
return nullptr;
}
\n"""
@ -112,6 +113,7 @@ def CheckBoost(context, boost_lib, require_version = None, header_only = False):
#endif
int main()
{
return 0;
}
\n"""
if context.TryLink(test_program, ".cpp"):
@ -135,6 +137,7 @@ def CheckBoostIostreamsGZip(context):
{
boost::iostreams::filtering_stream<boost::iostreams::output> filter;
filter.push(boost::iostreams::gzip_compressor(boost::iostreams::gzip_params()));
return 0;
}
\n"""
@ -165,6 +168,7 @@ def CheckBoostIostreamsBZip2(context):
{
boost::iostreams::filtering_stream<boost::iostreams::output> filter;
filter.push(boost::iostreams::bzip2_compressor(boost::iostreams::bzip2_params()));
return 0;
}
\n"""
@ -203,6 +207,7 @@ def CheckBoostLocaleBackends(context, backends):
for(auto backend : backends) {
std::cout << backend << std::endl;
}
return 0;
}
\n"""