diff --git a/src/Corrade/Python.h b/src/Corrade/Python.h index 98789ea..ec853b7 100644 --- a/src/Corrade/Python.h +++ b/src/Corrade/Python.h @@ -92,7 +92,7 @@ template class T, class U> T& pyObjectHolderFor(U& obj) { implemented on the client side instead of patching pybind itself */ template struct PyNonDestructibleBaseDeleter; template struct PyNonDestructibleBaseDeleter { - void operator()(T*) { CORRADE_ASSERT_UNREACHABLE(); /* LCOV_EXCL_LINE */ } + void operator()(T*) { CORRADE_INTERNAL_ASSERT_UNREACHABLE(); /* LCOV_EXCL_LINE */ } }; template struct PyNonDestructibleBaseDeleter { void operator()(T* ptr) { delete ptr; } diff --git a/src/python/corrade/containers.cpp b/src/python/corrade/containers.cpp index fd6b043..a7e2c29 100644 --- a/src/python/corrade/containers.cpp +++ b/src/python/corrade/containers.cpp @@ -254,25 +254,25 @@ template<> Containers::Array bytes(Containers::StridedArrayView<4, const c /* Getting a runtime tuple index. Ugh. */ template const T& dimensionsTupleGet(const typename DimensionsTuple<1, T>::Type& tuple, std::size_t i) { if(i == 0) return std::get<0>(tuple); - CORRADE_ASSERT_UNREACHABLE(); /* LCOV_EXCL_LINE */ + CORRADE_INTERNAL_ASSERT_UNREACHABLE(); /* LCOV_EXCL_LINE */ } template const T& dimensionsTupleGet(const typename DimensionsTuple<2, T>::Type& tuple, std::size_t i) { if(i == 0) return std::get<0>(tuple); if(i == 1) return std::get<1>(tuple); - CORRADE_ASSERT_UNREACHABLE(); /* LCOV_EXCL_LINE */ + CORRADE_INTERNAL_ASSERT_UNREACHABLE(); /* LCOV_EXCL_LINE */ } template const T& dimensionsTupleGet(const typename DimensionsTuple<3, T>::Type& tuple, std::size_t i) { if(i == 0) return std::get<0>(tuple); if(i == 1) return std::get<1>(tuple); if(i == 2) return std::get<2>(tuple); - CORRADE_ASSERT_UNREACHABLE(); /* LCOV_EXCL_LINE */ + CORRADE_INTERNAL_ASSERT_UNREACHABLE(); /* LCOV_EXCL_LINE */ } template const T& dimensionsTupleGet(const typename DimensionsTuple<4, T>::Type& tuple, std::size_t i) { if(i == 0) return std::get<0>(tuple); if(i == 1) return std::get<1>(tuple); if(i == 2) return std::get<2>(tuple); if(i == 3) return std::get<3>(tuple); - CORRADE_ASSERT_UNREACHABLE(); /* LCOV_EXCL_LINE */ + CORRADE_INTERNAL_ASSERT_UNREACHABLE(); /* LCOV_EXCL_LINE */ } template bool stridedArrayViewBufferProtocol(T& self, Py_buffer& buffer, int flags) { diff --git a/src/python/corrade/pluginmanager.h b/src/python/corrade/pluginmanager.h index 9972611..4c47fb9 100644 --- a/src/python/corrade/pluginmanager.h +++ b/src/python/corrade/pluginmanager.h @@ -41,7 +41,7 @@ namespace Corrade { namespace PluginManager { template struct PyPluginHolder: std::unique_ptr { explicit PyPluginHolder(T*) { /* Pybind needs this signature, but it should never be called */ - CORRADE_ASSERT_UNREACHABLE(); + CORRADE_INTERNAL_ASSERT_UNREACHABLE(); } explicit PyPluginHolder(T* object, pybind11::object manager) noexcept: std::unique_ptr{object}, manager{std::move(manager)} {} diff --git a/src/python/magnum/math.vector.h b/src/python/magnum/math.vector.h index 37f3968..de2dbc8 100644 --- a/src/python/magnum/math.vector.h +++ b/src/python/magnum/math.vector.h @@ -59,21 +59,21 @@ template void initFromBuffer(T& out, const Py_buffer& buffer) template void initFromBuffer(typename std::enable_if::value, T>::type& out, const Py_buffer& buffer) { if(buffer.format[0] == 'f') initFromBuffer(out, buffer); else if(buffer.format[0] == 'd') initFromBuffer(out, buffer); - else CORRADE_ASSERT_UNREACHABLE(); /* LCOV_EXCL_LINE */ + else CORRADE_INTERNAL_ASSERT_UNREACHABLE(); /* LCOV_EXCL_LINE */ } /* Signed integral init */ template void initFromBuffer(typename std::enable_if::value && std::is_signed::value, T>::type& out, const Py_buffer& buffer) { if(buffer.format[0] == 'i') initFromBuffer(out, buffer); else if(buffer.format[0] == 'l') initFromBuffer(out, buffer); - else CORRADE_ASSERT_UNREACHABLE(); /* LCOV_EXCL_LINE */ + else CORRADE_INTERNAL_ASSERT_UNREACHABLE(); /* LCOV_EXCL_LINE */ } /* Unsigned integral init */ template void initFromBuffer(typename std::enable_if::value && std::is_unsigned::value, T>::type& out, const Py_buffer& buffer) { if(buffer.format[0] == 'I') initFromBuffer(out, buffer); else if(buffer.format[0] == 'L') initFromBuffer(out, buffer); - else CORRADE_ASSERT_UNREACHABLE(); /* LCOV_EXCL_LINE */ + else CORRADE_INTERNAL_ASSERT_UNREACHABLE(); /* LCOV_EXCL_LINE */ } /* Things that have to be defined for both VectorN and Color so they construct @@ -259,7 +259,7 @@ template void vector(py::module& m, py::class_& c) { else if(name.size() == 3) return py::cast(out.xyz()); else if(name.size() == 2) return py::cast(out.xy()); /* this should be handled by the x/y/z/w/r/g/b/a properties instead */ - else CORRADE_ASSERT_UNREACHABLE(); /* LCOV_EXCL_LINE */ + else CORRADE_INTERNAL_ASSERT_UNREACHABLE(); /* LCOV_EXCL_LINE */ }, "Vector swizzle") .def("__setattr__", [](T& self, py::str nameO, py::object valueO) { std::string name = py::cast(nameO);