From: Daniel Arndt Date: Wed, 17 Jul 2019 16:00:05 +0000 (-0400) Subject: Fix compiling with NVCC prior to 9.2 X-Git-Tag: v9.2.0-rc1~1337^2~2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e551a1b53e9062071d3cecbb4beb7dd9d3a2c291;p=dealii.git Fix compiling with NVCC prior to 9.2 --- diff --git a/bundled/boost-1.70.0/include/boost/core/noncopyable.hpp b/bundled/boost-1.70.0/include/boost/core/noncopyable.hpp index 4a4f8baba5..a6b953b68f 100644 --- a/bundled/boost-1.70.0/include/boost/core/noncopyable.hpp +++ b/bundled/boost-1.70.0/include/boost/core/noncopyable.hpp @@ -38,12 +38,17 @@ namespace noncopyable_ // protection from unintended ADL class noncopyable: base_token { protected: -#if !defined(BOOST_NO_CXX11_DEFAULTED_FUNCTIONS) && !defined(BOOST_NO_CXX11_NON_PUBLIC_DEFAULTED_FUNCTIONS) +#if defined(BOOST_CUDA_VERSION) && (BOOST_CUDA_VERSION < 9020000) + noncopyable() {} + ~noncopyable() {} +#else + #if !defined(BOOST_NO_CXX11_DEFAULTED_FUNCTIONS) && !defined(BOOST_NO_CXX11_NON_PUBLIC_DEFAULTED_FUNCTIONS) BOOST_CONSTEXPR noncopyable() = default; ~noncopyable() = default; -#else + #else noncopyable() {} ~noncopyable() {} + #endif #endif #if !defined(BOOST_NO_CXX11_DELETED_FUNCTIONS) noncopyable( const noncopyable& ) = delete;