From 329d983392a363dd2d33251724d38c9c3878d116 Mon Sep 17 00:00:00 2001 From: Dean Moldovan Date: Tue, 14 Feb 2017 11:25:47 +0100 Subject: [PATCH] Revert "Template array constructor (#582)" This reverts commit bee8827a98fbb77def8cbe5c7aa4de956667baec. --- include/pybind11/numpy.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/include/pybind11/numpy.h b/include/pybind11/numpy.h index af0f5ae2..50eb682d 100644 --- a/include/pybind11/numpy.h +++ b/include/pybind11/numpy.h @@ -337,9 +337,8 @@ public: array() : array(0, static_cast(nullptr)) {} - template - array(const pybind11::dtype &dt, const Shape &shape, - const Strides &strides, const void *ptr = nullptr, + array(const pybind11::dtype &dt, const std::vector &shape, + const std::vector &strides, const void *ptr = nullptr, handle base = handle()) { auto& api = detail::npy_api::get(); auto ndim = shape.size(); @@ -537,7 +536,7 @@ protected: throw std::runtime_error("array is not writeable"); } - template static std::vector default_strides(const Shape& shape, size_t itemsize) { + static std::vector default_strides(const std::vector& shape, size_t itemsize) { auto ndim = shape.size(); std::vector strides(ndim); if (ndim) {