Disable concepts in libcxxmsvc for MSVC toolsets >= 14.29.x as well.. #2302

8f4800b43ba453e815c1148a0197c819a13763ca

Author: andrey-khropov

contrib/libs/cxxsupp/libcxxmsvc/include/__config

@@ -908,7 +908,8 @@ typedef unsigned int   char32_t;
 #  define _LIBCPP_CONSTEVAL consteval
 #endif
 
-#if _LIBCPP_STD_VER <= 17 || !defined(__cpp_concepts) || __cpp_concepts < 201907L
+// Even modern versions of MSVC toolkit have issues compiling libc++'s concepts-related code
+#if _LIBCPP_STD_VER <= 17 || defined(_LIBCPP_COMPILER_MSVC) || !defined(__cpp_concepts) || __cpp_concepts < 201907L
 #define _LIBCPP_HAS_NO_CONCEPTS
 #endif
 

contrib/libs/tbb/include/oneapi/tbb/detail/_config.h

@@ -243,7 +243,12 @@
 #elif _MSC_VER
     #define __TBB_CPP14_VARIABLE_TEMPLATES_PRESENT (_MSC_FULL_VER >= 190023918 && (!__INTEL_COMPILER || __INTEL_COMPILER >= 1700))
     #define __TBB_CPP17_DEDUCTION_GUIDES_PRESENT   (_MSC_VER >= 1914 && __TBB_LANG >= 201703L && (!__INTEL_COMPILER || __INTEL_COMPILER > 2021))
-    #define __TBB_CPP20_CONCEPTS_PRESENT           (_MSC_VER >= 1923 && __TBB_LANG >= 202002L) // TODO: INTEL_COMPILER?
+    #if !defined(__cpp_lib_concepts)
+        // TBB's concepts use STL's concepts
+        #define __TBB_CPP20_CONCEPTS_PRESENT       0
+    #else
+        #define __TBB_CPP20_CONCEPTS_PRESENT       (_MSC_VER >= 1923 && __TBB_LANG >= 202002L) // TODO: INTEL_COMPILER?
+    #endif
 #else
     #define __TBB_CPP14_VARIABLE_TEMPLATES_PRESENT (__TBB_LANG >= 201402L)
     #define __TBB_CPP17_DEDUCTION_GUIDES_PRESENT   (__TBB_LANG >= 201703L)