Skip to content

Commit e08a581

Browse files
Fix compilation with gcc < 5 (#2956)
When the user defines _GLIBCXX_USE_CXX11_ABI=0 to force the pre-c++11 ABI, numpy.h assumes that is_trivially_copyable is available. It is not necessarily the case. This patch uses clang's feature detection instead. The workaround is for certain libstdc++ versions, so the test should target these particular versions.
1 parent 114be7f commit e08a581

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

include/pybind11/numpy.h

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -319,14 +319,13 @@ template <typename T> using remove_all_extents_t = typename array_info<T>::type;
319319

320320
template <typename T> using is_pod_struct = all_of<
321321
std::is_standard_layout<T>, // since we're accessing directly in memory we need a standard layout type
322-
#if !defined(__GNUG__) || defined(_LIBCPP_VERSION) || defined(_GLIBCXX_USE_CXX11_ABI)
323-
// _GLIBCXX_USE_CXX11_ABI indicates that we're using libstdc++ from GCC 5 or newer, independent
324-
// of the actual compiler (Clang can also use libstdc++, but it always defines __GNUC__ == 4).
325-
std::is_trivially_copyable<T>,
326-
#else
327-
// GCC 4 doesn't implement is_trivially_copyable, so approximate it
322+
#if defined(__GLIBCXX__) && (__GLIBCXX__ < 20150422 || __GLIBCXX__ == 20150623 || __GLIBCXX__ == 20150626 || __GLIBCXX__ == 20160803)
323+
// libstdc++ < 5 (including versions 4.8.5, 4.9.3 and 4.9.4 which were released after 5)
324+
// don't implement is_trivially_copyable, so approximate it
328325
std::is_trivially_destructible<T>,
329326
satisfies_any_of<T, std::has_trivial_copy_constructor, std::has_trivial_copy_assign>,
327+
#else
328+
std::is_trivially_copyable<T>,
330329
#endif
331330
satisfies_none_of<T, std::is_reference, std::is_array, is_std_array, std::is_arithmetic, is_complex, std::is_enum>
332331
>;

0 commit comments

Comments
 (0)