Skip to content

GitLab

Commit bd24155b authored by Francesco Biscani's avatar Francesco Biscani Committed by Wenzel Jakob
Browse files

Aligned allocation fix for clang-cl (#1988)

parent deb3cb23
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
include/pybind11/cast.h
View file @ bd24155b
...@@ -591,7 +591,7 @@ public: ...@@ -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));
......
include/pybind11/pybind11.h
View file @ bd24155b
...@@ -1003,7 +1003,7 @@ void call_operator_delete(T *p, size_t s, size_t) { T::operator delete(p, s); } ...@@ -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));
......
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