Merge branch 'develop'

include/boost/config/auto_link.hpp

@@ -182,11 +182,16 @@ BOOST_LIB_SUFFIX:     Static/import libraries extension (".lib", ".a") for the c
      // vc14.1:
 #    define BOOST_LIB_TOOLSET "vc141"
 
-#  elif defined(BOOST_MSVC)
+#  elif defined(BOOST_MSVC) && (BOOST_MSVC < 1930)
 
      // vc14.2:
 #    define BOOST_LIB_TOOLSET "vc142"
 
+#  elif defined(BOOST_MSVC)
+
+     // vc14.3:
+#    define BOOST_LIB_TOOLSET "vc143"
+
 #  elif defined(BOOST_EMBTC_WINDOWS)
 
      // Embarcadero Clang based compilers:

include/boost/config/compiler/nvcc.hpp

@@ -22,6 +22,7 @@
 // BOOST_GPU_ENABLED : Flag a function or a method as being enabled on the host and device
 #define BOOST_GPU_ENABLED __host__ __device__
 
+#if !defined(__clang__) || defined(__NVCC__)
 // A bug in version 7.0 of CUDA prevents use of variadic templates in some occasions
 // https://svn.boost.org/trac/boost/ticket/11897
 // This is fixed in 7.5. As the following version macro was introduced in 7.5 an existance
@@ -38,6 +39,8 @@
 #  define BOOST_NO_CXX11_CONSTEXPR
 #endif
 
+#endif
+
 #ifdef __CUDACC__
 //
 // When compiing .cu files, there's a bunch of stuff that doesn't work with msvc:

include/boost/config/detail/suffix.hpp

@@ -476,11 +476,14 @@ namespace std {
 #endif
 
 //
-// If we're on a CUDA device (note DEVICE not HOST, irrespective of compiler) then disable __float128 support if present:
+// If we're on a CUDA device (note DEVICE not HOST, irrespective of compiler) then disable __int128 and __float128 support if present:
 //
 #if defined(__CUDA_ARCH__) && defined(BOOST_HAS_FLOAT128)
 #  undef BOOST_HAS_FLOAT128
 #endif
+#if defined(__CUDA_ARCH__) && defined(BOOST_HAS_INT128)
+#  undef BOOST_HAS_INT128
+#endif
 
 // long long workaround ------------------------------------------//
 // On gcc (and maybe other compilers?) long long is alway supported

include/boost/config/stdlib/libcpp.hpp

@@ -157,6 +157,9 @@
 #if !defined(__cpp_lib_semaphore) || (__cpp_lib_semaphore < 201907L)
 #  define BOOST_NO_CXX20_HDR_SEMAPHORE
 #endif
+#if !defined(__cpp_lib_concepts) || (__cpp_lib_concepts < 202002L)
+#  define BOOST_NO_CXX20_HDR_CONCEPTS
+#endif
 
 #if(_LIBCPP_VERSION < 9000) && !defined(BOOST_NO_CXX20_HDR_SPAN)
 // as_writable_bytes is missing.