Zengtudor
/
pybind11
mirror of https://github.com/pybind/pybind11.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix compilation with Clang on host GCC < 5 (old libstdc++)

This commit is contained in:
Dean Moldovan 2017-09-04 21:16:09 +02:00
parent cdf38dc6ba
commit b0a0e4a23c
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/changelog.rst
View File

@ -14,6 +14,9 @@ v2.3.0 (Not yet released)
v2.2.1 (Not yet released) v2.2.1 (Not yet released)
----------------------------------------------------- -----------------------------------------------------
* Fixed compilation with Clang on host GCC < 5 (old libstdc++ which isn't fully
C++11 compliant). `#1062 <https://github.com/pybind/pybind11/pull/1062>`_.
* Fixed a regression where the ``py::keep_alive`` policy could not be applied * Fixed a regression where the ``py::keep_alive`` policy could not be applied
to constructors. `#1065 <https://github.com/pybind/pybind11/pull/1065>`_. to constructors. `#1065 <https://github.com/pybind/pybind11/pull/1065>`_.

4
include/pybind11/numpy.h
View File

@ -288,7 +288,9 @@ template <typename T> using remove_all_extents_t = typename array_info<T>::type;
template <typename T> using is_pod_struct = all_of< template <typename T> using is_pod_struct = all_of<
std::is_standard_layout<T>, // since we're accessing directly in memory we need a standard layout type std::is_standard_layout<T>, // since we're accessing directly in memory we need a standard layout type
#if !defined(__GNUG__) || defined(__clang__) || __GNUC__ >= 5 #if !defined(__GNUG__) || defined(_LIBCPP_VERSION) || defined(_GLIBCXX_USE_CXX11_ABI)
// _GLIBCXX_USE_CXX11_ABI indicates that we're using libstdc++ from GCC 5 or newer, independent
// of the actual compiler (Clang can also use libstdc++, but it always defines __GNUC__ == 4).
std::is_trivially_copyable<T>, std::is_trivially_copyable<T>,
#else #else
// GCC 4 doesn't implement is_trivially_copyable, so approximate it // GCC 4 doesn't implement is_trivially_copyable, so approximate it