From 0dece8dc5eaafcdbb62f638beb94f2a174d1f495 Mon Sep 17 00:00:00 2001 From: Boris Staletic Date: Thu, 3 Jan 2019 12:01:34 +0100 Subject: [PATCH 1/2] Use new Doxygen archive URL - fixes Travis --- .travis.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 928f517fcf..d7f300e6b4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,16 +10,17 @@ matrix: # - Makes sure that everything still works without optional deps (numpy/scipy/eigen) and # also tests the automatic discovery functions in CMake (Python version, C++ standard). - os: linux + dist: xenial # Necessary to run doxygen 1.8.15 env: STYLE DOCS PIP cache: false before_install: - pyenv global $(pyenv whence 2to3) # activate all python versions - PY_CMD=python3 - - $PY_CMD -m pip install --user --upgrade pip wheel + - $PY_CMD -m pip install --user --upgrade pip wheel setuptools install: - $PY_CMD -m pip install --user --upgrade sphinx sphinx_rtd_theme breathe flake8 pep8-naming pytest - - curl -fsSL ftp://ftp.stack.nl/pub/users/dimitri/doxygen-1.8.12.linux.bin.tar.gz | tar xz - - export PATH="$PWD/doxygen-1.8.12/bin:$PATH" + - curl -fsSL https://sourceforge.net/projects/doxygen/files/rel-1.8.15/doxygen-1.8.15.linux.bin.tar.gz/download | tar xz + - export PATH="$PWD/doxygen-1.8.15/bin:$PATH" script: - tools/check-style.sh - flake8 @@ -32,7 +33,7 @@ matrix: diff -rq $installed ./include/pybind11 - | # Barebones build - cmake -DCMAKE_BUILD_TYPE=Debug -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON + cmake -DCMAKE_BUILD_TYPE=Debug -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON -DPYTHON_EXECUTABLE=$(which $PY_CMD) make pytest -j 2 make cpptest -j 2 # The following are regular test configurations, including optional dependencies. From e228b7e7ec45a7c44b472e272b0cbbaa9dce36db Mon Sep 17 00:00:00 2001 From: Boris Staletic Date: Thu, 3 Jan 2019 12:02:39 +0100 Subject: [PATCH 2/2] Avoid Visual Studio 2017 15.9.4 ICE --- include/pybind11/numpy.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/include/pybind11/numpy.h b/include/pybind11/numpy.h index bdc3a5ddd8..37471d8be9 100644 --- a/include/pybind11/numpy.h +++ b/include/pybind11/numpy.h @@ -1466,7 +1466,10 @@ struct vectorize_helper { private: remove_reference_t f; - template using param_n_t = typename pack_element::call_type...>::type; + // Internal compiler error in MSVC 19.16.27025.1 (Visual Studio 2017 15.9.4), when compiling with "/permissive-" flag + // when arg_call_types is manually inlined. + using arg_call_types = std::tuple::call_type...>; + template using param_n_t = typename std::tuple_element::type; // Runs a vectorized function given arguments tuple and three index sequences: // - Index is the full set of 0 ... (N-1) argument indices;