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

fix: std::is_pod -> pybind11::detail::is_pod

Browse Source
This commit is contained in:
Henry Schreiner 2020-10-15 09:43:49 -04:00 committed by Henry Schreiner
parent f200832534
commit b72c79f964
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/pybind11/numpy.h
View File

@ -20,6 +20,7 @@
#include <sstream> #include <sstream>
#include <string> #include <string>
#include <functional> #include <functional>
#include <type_traits>
#include <utility> #include <utility>
#include <vector> #include <vector>
#include <typeindex> #include <typeindex>
@ -328,6 +329,12 @@ template <typename T> using is_pod_struct = all_of<
satisfies_none_of<T, std::is_reference, std::is_array, is_std_array, std::is_arithmetic, is_complex, std::is_enum> satisfies_none_of<T, std::is_reference, std::is_array, is_std_array, std::is_arithmetic, is_complex, std::is_enum>
>; >;
// Replacement for std::is_pod (deprecated in C++20)
template <typename T> using is_pod = all_of<
std::is_standard_layout<T>,
std::is_trivial<T>
>;
template <ssize_t Dim = 0, typename Strides> ssize_t byte_offset_unsafe(const Strides &) { return 0; } template <ssize_t Dim = 0, typename Strides> ssize_t byte_offset_unsafe(const Strides &) { return 0; }
template <ssize_t Dim = 0, typename Strides, typename... Ix> template <ssize_t Dim = 0, typename Strides, typename... Ix>
ssize_t byte_offset_unsafe(const Strides &strides, ssize_t i, Ix... index) { ssize_t byte_offset_unsafe(const Strides &strides, ssize_t i, Ix... index) {
@ -1448,7 +1455,7 @@ struct vectorize_arg {
using call_type = remove_reference_t<T>; using call_type = remove_reference_t<T>;
// Is this a vectorized argument? // Is this a vectorized argument?
static constexpr bool vectorize = static constexpr bool vectorize =
satisfies_any_of<call_type, std::is_arithmetic, is_complex, std::is_pod>::value && satisfies_any_of<call_type, std::is_arithmetic, is_complex, is_pod>::value &&
satisfies_none_of<call_type, std::is_pointer, std::is_array, is_std_array, std::is_enum>::value && satisfies_none_of<call_type, std::is_pointer, std::is_array, is_std_array, std::is_enum>::value &&
(!std::is_reference<T>::value || (!std::is_reference<T>::value ||
(std::is_lvalue_reference<T>::value && std::is_const<call_type>::value)); (std::is_lvalue_reference<T>::value && std::is_const<call_type>::value));