import new upstream nautilus stable release 14.2.8

[ceph.git] / ceph / src / boost / boost / config / compiler / nvcc.hpp

diff --git a/ceph/src/boost/boost/config/compiler/nvcc.hpp b/ceph/src/boost/boost/config/compiler/nvcc.hpp
index f21b9b54fe0403b66a0233714f7c472535ff6aa1..ed035fcf73e3a40eb02bea7c0ada4457b9a3b4e2 100644 (file)
--- a/ceph/src/boost/boost/config/compiler/nvcc.hpp
+++ b/ceph/src/boost/boost/config/compiler/nvcc.hpp
@@ -12,7 +12,7 @@
 #endif
 
 #if defined(__CUDACC_VER_MAJOR__) && defined(__CUDACC_VER_MINOR__) && defined(__CUDACC_VER_BUILD__)
-#  define BOOST_CUDA_VERSION __CUDACC_VER_MAJOR__ * 1000000 + __CUDACC_VER_MINOR__ * 10000 + __CUDACC_VER_BUILD__
+#  define BOOST_CUDA_VERSION (__CUDACC_VER_MAJOR__ * 1000000 + __CUDACC_VER_MINOR__ * 10000 + __CUDACC_VER_BUILD__)
 #else
 // We don't really know what the CUDA version is, but it's definitely before 7.5:
 #  define BOOST_CUDA_VERSION 7000000
@@ -33,8 +33,8 @@
 #if (BOOST_CUDA_VERSION > 8000000) && (BOOST_CUDA_VERSION < 8010000)
 #   define BOOST_NO_CXX11_VARIADIC_TEMPLATES
 #endif
-// Most recent CUDA (8.0) has no constexpr support in msvc mode:
-#if defined(_MSC_VER)
+// CUDA (8.0) has no constexpr support in msvc mode:
+#if defined(_MSC_VER) && (BOOST_CUDA_VERSION < 9000000)
 #  define BOOST_NO_CXX11_CONSTEXPR
 #endif