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

Attempt to fix Travis build

Browse source
This commit is contained in:
Celtic Minstrel 2016-04-04 17:00:41 -04:00
parent 74fd5395a9
commit 2d72d1512b
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -47,7 +47,7 @@ before_install:
- if [ "$BUILD" == "C++14 -O2" ]; then export WML_TEST_TIME=15; fi
- if [ "$BUILD" == "C++14 -O2" ]; then export CXXSTD="1y"; fi
- if [ "$BUILD" == "-O0" ]; then export EXTRA_FLAGS_RELEASE="-O0 -Wno-literal-suffix -Wno-deprecated-declarations"; fi
- if [ "$BUILD" == "-O0" ]; then export EXTRA_FLAGS_RELEASE="-O0 -Wno-deprecated-declarations"; fi
- if [[ "$BUILD" == "-O0" ]] && [[ "$CXX" == "clang++" ]]; then export EXTRA_FLAGS_RELEASE="-O0 -Wno-literal-suffix -Wno-deprecated-declarations -Wno-deprecated-register"; fi
- if [ "$BUILD" == "-O0" ]; then export PLAY_TEST=false; fi
- if [ "$BUILD" == "-O0" ]; then export MP_TEST=false; fi

6
src/utils/functional.hpp
View file

@ -27,8 +27,10 @@
// Instead, we specialize std::is_placeholder for the Boost placeholders,
// so that Boost placeholders can be passed to std::bind.
template<int N>
struct std::is_placeholder<boost::arg<N>> : public std::integral_constant<int, N> {};
namespace std { // Some compilers can't handle it being specialized in the global scope
template<int N>
struct is_placeholder<boost::arg<N>> : public integral_constant<int, N> {};
}
namespace detail {
template<typename Ret, typename... T>