update ceph source to reef 18.1.2

[ceph.git] / ceph / src / boost / boost / type_traits / intrinsics.hpp

diff --git a/ceph/src/boost/boost/type_traits/intrinsics.hpp b/ceph/src/boost/boost/type_traits/intrinsics.hpp
index 02f2a0315b9feaacdfcb51bdfb6e5e8e2c8ad1fc..72b6d90ef1f950c52715b28379e972926d3e014f 100644 (file)
--- a/ceph/src/boost/boost/type_traits/intrinsics.hpp
+++ b/ceph/src/boost/boost/type_traits/intrinsics.hpp
@@ -160,7 +160,7 @@
 #   define BOOST_HAS_TYPE_TRAITS_INTRINSICS
 #endif
 
-#if defined(BOOST_CLANG) && defined(__has_feature) && !defined(__CUDACC__)
+#if defined(BOOST_CLANG) && defined(__has_feature) && (!(defined(__CUDACC__) && (__CUDACC_VER_MAJOR__ < 11)) || defined(__CUDA__))
 //
 // Note that these intrinsics are disabled for the CUDA meta-compiler as it appears
 // to not support them, even though the underlying clang compiler does so.