update ceph source to reef 18.1.2

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

diff --git a/ceph/src/boost/boost/type_traits.hpp b/ceph/src/boost/boost/type_traits.hpp
index 406fd02d0098d75fd748ef2891413897510d56f3..a1c882e03b8d8711dc07514549a45fb82061f01f 100644 (file)
--- a/ceph/src/boost/boost/type_traits.hpp
+++ b/ceph/src/boost/boost/type_traits.hpp
@@ -60,7 +60,7 @@
 #include <boost/type_traits/has_multiplies.hpp>
 #include <boost/type_traits/has_multiplies_assign.hpp>
 #include <boost/type_traits/has_negate.hpp>
-#if !defined(BOOST_BORLANDC) && !defined(__CUDACC__)
+#if !defined(BOOST_BORLANDC) && (!(defined(__CUDACC__) && (__CUDACC_VER_MAJOR__ < 11)) || defined(__CUDA__))
 #include <boost/type_traits/has_new_operator.hpp>
 #endif
 #include <boost/type_traits/has_not_equal_to.hpp>