Skip to content

GitLab

Commit a6064822 authored by Wenzel Jakob's avatar Wenzel Jakob
Browse files

Revert "numpy.h: minor preprocessor fix suggested by @chaekwan" 

This reverts commit 61e4f118.
parent 61e4f118
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
include/pybind11/numpy.h
View file @ a6064822
...@@ -311,7 +311,7 @@ template <typename T> using remove_all_extents_t = typename array_info<T>::type; ...@@ -311,7 +311,7 @@ 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(_LIBCPP_VERSION) || (defined(_GLIBCXX_USE_CXX11_ABI) && _GLIBCXX_USE_CXX11_ABI != 0) #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 // _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). // 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>,
......
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