Skip to content

Commit e931e31

Browse files
committed
Fix Travis and Appveyor
Use upstream Doxygen archive Work around a MSVC bug that leads to an ICE
1 parent e2b884c commit e931e31

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

.travis.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,17 @@ matrix:
1010
# - Makes sure that everything still works without optional deps (numpy/scipy/eigen) and
1111
# also tests the automatic discovery functions in CMake (Python version, C++ standard).
1212
- os: linux
13+
dist: xenial # Necessary to run doxygen 1.8.15
1314
env: STYLE DOCS PIP
1415
cache: false
1516
before_install:
1617
- pyenv global $(pyenv whence 2to3) # activate all python versions
1718
- PY_CMD=python3
18-
- $PY_CMD -m pip install --user --upgrade pip wheel
19+
- $PY_CMD -m pip install --user --upgrade pip wheel setuptools
1920
install:
2021
- $PY_CMD -m pip install --user --upgrade sphinx sphinx_rtd_theme breathe flake8 pep8-naming pytest
21-
- curl -fsSL ftp://ftp.stack.nl/pub/users/dimitri/doxygen-1.8.12.linux.bin.tar.gz | tar xz
22-
- export PATH="$PWD/doxygen-1.8.12/bin:$PATH"
22+
- curl -fsSL https://sourceforge.net/projects/doxygen/files/rel-1.8.15/doxygen-1.8.15.linux.bin.tar.gz/download | tar xz
23+
- export PATH="$PWD/doxygen-1.8.15/bin:$PATH"
2324
script:
2425
- tools/check-style.sh
2526
- flake8
@@ -32,7 +33,7 @@ matrix:
3233
diff -rq $installed ./include/pybind11
3334
- |
3435
# Barebones build
35-
cmake -DCMAKE_BUILD_TYPE=Debug -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON
36+
cmake -DCMAKE_BUILD_TYPE=Debug -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON -DPYTHON_EXECUTABLE=$(which $PY_CMD)
3637
make pytest -j 2
3738
make cpptest -j 2
3839
# The following are regular test configurations, including optional dependencies.

include/pybind11/numpy.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1466,7 +1466,10 @@ struct vectorize_helper {
14661466
private:
14671467
remove_reference_t<Func> f;
14681468

1469-
template <size_t Index> using param_n_t = typename pack_element<Index, typename vectorize_arg<Args>::call_type...>::type;
1469+
// Internal compiler error in MSVC 19.16.27025.1 (Visual Studio 2017 15.9.4), when compiling with "/permissive-" flag
1470+
// when arg_call_types is manually inlined.
1471+
using arg_call_types = std::tuple<typename vectorize_arg<Args>::call_type...>;
1472+
template <size_t Index> using param_n_t = typename std::tuple_element<Index, arg_call_types>::type;
14701473

14711474
// Runs a vectorized function given arguments tuple and three index sequences:
14721475
// - Index is the full set of 0 ... (N-1) argument indices;

0 commit comments

Comments
 (0)