Skip to content

Commit

Permalink
Attempt to fix Travis build
Browse files Browse the repository at this point in the history
  • Loading branch information
CelticMinstrel committed Apr 4, 2016
1 parent 74fd539 commit 2d72d15
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions src/utils/functional.hpp
Expand Up @@ -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>
Expand Down

0 comments on commit 2d72d15

Please sign in to comment.