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

Obey __cpp_sized_deallocation and __cpp_aligned_new

Browse Source 
Don't assume that just because the language version is C++17 that the
standard library offers all C++17 features, too.  When using clang-6.0
and --std=c++17 on Ubuntu 18.04 with libstdc++, __cpp_sized_deallocation
is false.
This commit is contained in:
Jeremy Nimmer 2019-06-14 12:12:51 -04:00 committed by Wenzel Jakob
parent 6c29cbf88d
commit 759221f5c5
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/pybind11/cast.h
View File

@ -574,10 +574,10 @@ 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 {
#if defined(PYBIND11_CPP17) #ifdef __cpp_aligned_new
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));
else else
#endif #endif
vptr = ::operator new(type->type_size); vptr = ::operator new(type->type_size);

21
include/pybind11/pybind11.h
View File

@ -1003,14 +1003,21 @@ 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;
#if defined(PYBIND11_CPP17) #ifdef __cpp_aligned_new
if (a > __STDCPP_DEFAULT_NEW_ALIGNMENT__) if (a > __STDCPP_DEFAULT_NEW_ALIGNMENT__) {
::operator delete(p, s, std::align_val_t(a)); #ifdef __cpp_sized_deallocation
else ::operator delete(p, s, std::align_val_t(a));
#else
::operator delete(p, std::align_val_t(a));
#endif
return;
}
#endif
#ifdef __cpp_sized_deallocation
::operator delete(p, s); ::operator delete(p, s);
#else #else
::operator delete(p); ::operator delete(p);
#endif #endif
} }
NAMESPACE_END(detail) NAMESPACE_END(detail)