Zengtudor/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2024-11-26 15:12:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Always decay type param of npy_format_descriptor

Browse Source
This commit is contained in:
Ivan Smirnov 2016-08-15 01:24:28 +01:00
parent edbd4cb0a7
commit 67b3daeea4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/pybind11/numpy.h
View File

@ -29,8 +29,6 @@ NAMESPACE_BEGIN(pybind11)
namespace detail { namespace detail {
template <typename type, typename SFINAE = void> struct npy_format_descriptor { }; template <typename type, typename SFINAE = void> struct npy_format_descriptor { };
template <typename type> struct is_pod_struct; template <typename type> struct is_pod_struct;
template <typename T> using decay_cv_ref =
typename std::remove_cv<typename std::remove_reference<T>::type>::type;
struct npy_api { struct npy_api {
enum constants { enum constants {
@ -148,7 +146,7 @@ public:
} }
template <typename T> static dtype of() { template <typename T> static dtype of() {
return detail::npy_format_descriptor<T>::dtype(); return detail::npy_format_descriptor<typename std::remove_cv<T>::type>::dtype();
} }
size_t itemsize() const { size_t itemsize() const {
@ -306,7 +304,9 @@ public:
template <typename T> template <typename T>
struct format_descriptor<T, typename std::enable_if<detail::is_pod_struct<T>::value>::type> { struct format_descriptor<T, typename std::enable_if<detail::is_pod_struct<T>::value>::type> {
static std::string format() { return detail::npy_format_descriptor<T>::format(); } static std::string format() {
return detail::npy_format_descriptor<typename std::remove_cv<T>::type>::format();
}
}; };
template <size_t N> struct format_descriptor<char[N]> { template <size_t N> struct format_descriptor<char[N]> {