Skip to content

GitLab

Commit 73f56830 authored by Ivan Smirnov's avatar Ivan Smirnov
Browse files

Add detail::is_pod_struct<T> helper

parent d0bafd90
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 16 deletions
include/pybind11/numpy.h
View file @ 73f56830
...@@ -23,7 +23,19 @@ ...@@ -23,7 +23,19 @@
#endif #endif
NAMESPACE_BEGIN(pybind11) NAMESPACE_BEGIN(pybind11)
namespace detail { template <typename type, typename SFINAE = void> struct npy_format_descriptor { }; } namespace detail {
template <typename type, typename SFINAE = void> struct npy_format_descriptor { };
template <typename T>
struct is_pod_struct {
enum { value = std::is_pod<T>::value && // offsetof only works correctly for POD types
!std::is_integral<T>::value &&
!std::is_same<T, float>::value &&
!std::is_same<T, bool>::value &&
!std::is_same<T, std::complex<float>>::value &&
!std::is_same<T, std::complex<double>>::value };
};
}
class array : public buffer { class array : public buffer {
public: public:
...@@ -156,14 +168,8 @@ public: ...@@ -156,14 +168,8 @@ public:
} }
}; };
template <typename T> struct format_descriptor template <typename T>
<T, typename std::enable_if<std::is_pod<T>::value && struct format_descriptor<T, typename std::enable_if<detail::is_pod_struct<T>::value>::type> {
!std::is_integral<T>::value &&
!std::is_same<T, float>::value &&
!std::is_same<T, bool>::value &&
!std::is_same<T, std::complex<float>>::value &&
!std::is_same<T, std::complex<double>>::value>::type>
{
static const char *format() { static const char *format() {
return detail::npy_format_descriptor<T>::format(); return detail::npy_format_descriptor<T>::format();
} }
...@@ -217,13 +223,8 @@ struct field_descriptor { ...@@ -217,13 +223,8 @@ struct field_descriptor {
object descr; object descr;
}; };
template <typename T> struct npy_format_descriptor template <typename T>
<T, typename std::enable_if<std::is_pod<T>::value && // offsetof only works correctly for POD types struct npy_format_descriptor<T, typename std::enable_if<is_pod_struct<T>::value>::type>
!std::is_integral<T>::value &&
!std::is_same<T, float>::value &&
!std::is_same<T, bool>::value &&
!std::is_same<T, std::complex<float>>::value &&
!std::is_same<T, std::complex<double>>::value>::type>
{ {
static PYBIND11_DESCR name() { return _("user-defined"); } static PYBIND11_DESCR name() { return _("user-defined"); }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment