add condition for libstdc++ >= 7

masmirnoff · Nov 11, 2021 · 047ad82 · 047ad82
1 parent 0ac6a1d
commit 047ad82
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/include/xtensor/xutils.hpp b/include/xtensor/xutils.hpp
@@ -637,11 +637,16 @@ namespace xt
      * xtrivial_default_construct implemenation *
      ********************************************/
 
+#if defined(_GLIBCXX_RELEASE) && _GLIBCXX_RELEASE >= 7
+// has_trivial_default_constructor has not been available since libstdc++-7.
+#define XTENSOR_GLIBCXX_USE_CXX11_ABI 1
+#else
 #if defined(_GLIBCXX_USE_CXX11_ABI)
 #if _GLIBCXX_USE_CXX11_ABI || (defined(_GLIBCXX_USE_DUAL_ABI) && !_GLIBCXX_USE_DUAL_ABI)
 #define XTENSOR_GLIBCXX_USE_CXX11_ABI 1
 #endif
 #endif
+#endif
 
 #if !defined(__GNUG__) || defined(_LIBCPP_VERSION) || defined(XTENSOR_GLIBCXX_USE_CXX11_ABI)