Merge branch 'develop'

boostorg · Mar 14, 2024 · d2390d4 · d2390d4
2 parents 4d0885a + 879a5d4
commit d2390d4
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/build/Jamfile.v2 b/build/Jamfile.v2
@@ -13,13 +13,13 @@ project
       <toolset>intel-win:<linkflags>-nologo 
       #<toolset>intel-linux:<pch>off
       <toolset>intel-darwin:<pch>off
-      <toolset>msvc-7.1:<pch>off
       <toolset>gcc,<target-os>windows:<pch>off
       #<toolset>gcc:<cxxflags>-fvisibility=hidden
       <toolset>intel-linux:<cxxflags>-fvisibility=hidden
       #<toolset>sun:<cxxflags>-xldscope=hidden
       [ check-target-builds ../config//has_gcc_visibility "gcc visibility" : <toolset>gcc:<cxxflags>-fvisibility=hidden : ]
       [ requires cxx11_noexcept cxx11_rvalue_references sfinae_expr cxx11_auto_declarations cxx11_lambdas cxx11_unified_initialization_syntax cxx11_hdr_tuple cxx11_hdr_initializer_list cxx11_hdr_chrono cxx11_thread_local cxx11_constexpr cxx11_nullptr cxx11_numeric_limits cxx11_decltype cxx11_hdr_array cxx11_hdr_atomic cxx11_hdr_type_traits cxx11_allocator cxx11_explicit_conversion_operators ]
+      [ requires cxx14_decltype_auto cxx14_generic_lambdas cxx14_return_type_deduction cxx14_variable_templates cxx14_decltype_auto cxx14_generic_lambdas cxx14_return_type_deduction ]
     ;
 
 cpp-pch pch : ../src/tr1/pch.hpp : <include>../src/tr1 <link>shared:<define>BOOST_MATH_TR1_DYN_LINK=1 ; 

diff --git a/include/boost/math/ccmath/detail/config.hpp b/include/boost/math/ccmath/detail/config.hpp
@@ -43,7 +43,7 @@
 //
 // Don't check here for msvc as they didn't get std lib configuration macros at the same time as C++17 <type_traits>
 //
-#if (__cpp_lib_bool_constant < 201505L) && !defined(BOOST_MATH_NO_CCMATH)
+#if (defined(__cpp_lib_bool_constant) && __cpp_lib_bool_constant < 201505L) && !defined(BOOST_MATH_NO_CCMATH)
 #  define BOOST_MATH_NO_CCMATH
 #endif
 #endif

diff --git a/include/boost/math/tools/config.hpp b/include/boost/math/tools/config.hpp
@@ -197,7 +197,7 @@
 #endif
 
 // C++23
-#if __cplusplus > 202002L || _MSVC_LANG > 202002L
+#if __cplusplus > 202002L || (defined(_MSVC_LANG) &&_MSVC_LANG > 202002L)
 #  if __GNUC__ >= 13
      // libstdc++3 only defines to/from_chars for std::float128_t when one of these defines are set
      // otherwise we're right out of luck...

diff --git a/include/boost/math/tools/promotion.hpp b/include/boost/math/tools/promotion.hpp
@@ -27,7 +27,7 @@
 #include <type_traits>
 
 #if defined __has_include
-#  if __cplusplus > 202002L || _MSVC_LANG > 202002L 
+#  if __cplusplus > 202002L || (defined(_MSVC_LANG) && _MSVC_LANG > 202002L)
 #    if __has_include (<stdfloat>)
 #    include <stdfloat>
 #    endif