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

Aligned allocation fix for clang-cl (#1988)

Browse Source
This commit is contained in:
Francesco Biscani 2019-11-16 01:18:24 +01:00 committed by Wenzel Jakob
parent deb3cb238a
commit bd24155b8b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/pybind11/cast.h
View File

@ -591,7 +591,7 @@ public:
if (type->operator_new) { if (type->operator_new) {
vptr = type->operator_new(type->type_size); vptr = type->operator_new(type->type_size);
} else { } else {
#ifdef __cpp_aligned_new #if defined(__cpp_aligned_new) && (!defined(_MSC_VER) || _MSC_VER >= 1912)
if (type->type_align > __STDCPP_DEFAULT_NEW_ALIGNMENT__) if (type->type_align > __STDCPP_DEFAULT_NEW_ALIGNMENT__)
vptr = ::operator new(type->type_size, vptr = ::operator new(type->type_size,
std::align_val_t(type->type_align)); std::align_val_t(type->type_align));

2
include/pybind11/pybind11.h
View File

@ -1003,7 +1003,7 @@ void call_operator_delete(T *p, size_t s, size_t) { T::operator delete(p, s); }
inline void call_operator_delete(void *p, size_t s, size_t a) { inline void call_operator_delete(void *p, size_t s, size_t a) {
(void)s; (void)a; (void)s; (void)a;
#ifdef __cpp_aligned_new #if defined(__cpp_aligned_new) && (!defined(_MSC_VER) || _MSC_VER >= 1912)
if (a > __STDCPP_DEFAULT_NEW_ALIGNMENT__) { if (a > __STDCPP_DEFAULT_NEW_ALIGNMENT__) {
#ifdef __cpp_sized_deallocation #ifdef __cpp_sized_deallocation
::operator delete(p, s, std::align_val_t(a)); ::operator delete(p, s, std::align_val_t(a));