diff --git a/.github/workflows/test-osx.yml b/.github/workflows/test-osx.yml index 03b99f8ca7..854bcb8ab2 100644 --- a/.github/workflows/test-osx.yml +++ b/.github/workflows/test-osx.yml @@ -24,6 +24,9 @@ jobs: brew install boost python -m pip install --upgrade pip python -m pip install setuptools faber + boostDir=/opt/homebrew/Cellar/boost/1.86.0 + [[ -d $boostDir ]] || boostDir=/opt/homebrew/Cellar/boost/1.86.0_2 + echo "boostDir=$boostDir" >> "$GITHUB_ENV" - name: build run: | python --version @@ -32,7 +35,7 @@ jobs: faber -v sed -e "s/\$PYTHON/python/g" .ci/faber > ~/.faber faber \ - --with-boost-include=/opt/homebrew/Cellar/boost/1.86.0/include \ + --with-boost-include=$boostDir/include \ --builddir=build \ cxx.name=${{ matrix.cxx }} \ cxxflags=-std=${{ matrix.std }} \ @@ -40,7 +43,7 @@ jobs: - name: test run: | faber \ - --with-boost-include=/opt/homebrew/Cellar/boost/1.86.0/include \ + --with-boost-include=$boostDir/include \ --builddir=build\ cxx.name=${{ matrix.cxx }} \ cxxflags=-std=${{ matrix.std }} \ diff --git a/include/boost/python/detail/defaults_def.hpp b/include/boost/python/detail/defaults_def.hpp index a721b76794..3b7bbaf17e 100644 --- a/include/boost/python/detail/defaults_def.hpp +++ b/include/boost/python/detail/defaults_def.hpp @@ -89,7 +89,7 @@ namespace detail NameSpaceT& name_space , char const* name , Func f - , keyword_range const& kw // ignored + , keyword_range const& , CallPolicies const& policies , char const* doc , module* diff --git a/include/boost/python/numpy/ndarray.hpp b/include/boost/python/numpy/ndarray.hpp index 2cb3b509f8..f10e87091a 100644 --- a/include/boost/python/numpy/ndarray.hpp +++ b/include/boost/python/numpy/ndarray.hpp @@ -176,7 +176,7 @@ ndarray from_data_impl(void * data, Container strides, object const & owner, bool writeable, - typename boost::enable_if< boost::python::detail::is_integral >::type * enabled = NULL) + typename boost::enable_if< boost::python::detail::is_integral >::type * = NULL) { std::vector shape_(shape.begin(),shape.end()); std::vector strides_(strides.begin(), strides.end()); diff --git a/src/object/function.cpp b/src/object/function.cpp index 7b6ab9f08b..fa0aff48ff 100644 --- a/src/object/function.cpp +++ b/src/object/function.cpp @@ -21,6 +21,7 @@ #include #include +#include #include #include @@ -628,6 +629,7 @@ extern "C" function_descr_get(PyObject *func, PyObject *obj, PyObject *type_) { #if PY_VERSION_HEX >= 0x03000000 + boost::ignore_unused(type_); // The implement is different in Python 3 because of the removal of unbound method if (obj == Py_None || obj == NULL) { Py_INCREF(func); diff --git a/src/object/function_doc_signature.cpp b/src/object/function_doc_signature.cpp index 18d458698d..a7c4db9a5f 100644 --- a/src/object/function_doc_signature.cpp +++ b/src/object/function_doc_signature.cpp @@ -105,7 +105,7 @@ namespace boost { namespace python { namespace objects { return res; } - str function_doc_signature_generator::raw_function_pretty_signature(function const *f, size_t n_overloads, bool cpp_types ) + str function_doc_signature_generator::raw_function_pretty_signature(function const *f, size_t /*n_overloads*/, bool /*cpp_types*/ ) { str res("object");