Aligned allocation fix for clang-cl (#1988)

pybind · Nov 16, 2019 · bd24155 · bd24155
1 parent deb3cb2
commit bd24155
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/include/pybind11/cast.h b/include/pybind11/cast.h
@@ -591,7 +591,7 @@ class type_caster_generic {
             if (type->operator_new) {
                 vptr = type->operator_new(type->type_size);
             } else {
-                #ifdef __cpp_aligned_new
+                #if defined(__cpp_aligned_new) && (!defined(_MSC_VER) || _MSC_VER >= 1912)
                     if (type->type_align > __STDCPP_DEFAULT_NEW_ALIGNMENT__)
                         vptr = ::operator new(type->type_size,
                                               std::align_val_t(type->type_align));

diff --git a/include/pybind11/pybind11.h b/include/pybind11/pybind11.h
@@ -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) {
     (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__) {
             #ifdef __cpp_sized_deallocation
                 ::operator delete(p, s, std::align_val_t(a));