From f1cfa1e1c25a767674344245f241e355cfea5dea Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Thu, 4 Jul 2024 20:20:08 -0400 Subject: [PATCH] Resotore ad_number_traits.h --- .../differentiation/ad/ad_number_traits.h | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/include/deal.II/differentiation/ad/ad_number_traits.h b/include/deal.II/differentiation/ad/ad_number_traits.h index a322e39eb2..e549a4e91a 100644 --- a/include/deal.II/differentiation/ad/ad_number_traits.h +++ b/include/deal.II/differentiation/ad/ad_number_traits.h @@ -741,8 +741,8 @@ namespace Differentiation std::enable_if_t< std::is_floating_point_v || (boost::is_complex::value && - std::is_floating_point_v< - typename internal::RemoveComplexWrapper::type>)>> + std::is_floating_point< + typename internal::RemoveComplexWrapper::type>::value)>> { /** * The type of taping used @@ -862,8 +862,8 @@ namespace Differentiation /** * The actual auto-differentiable number type */ - using ad_type = - std::conditional_t; + using ad_type = typename std:: + conditional::type; /** * The actual auto-differentiable number directional derivative type @@ -940,8 +940,8 @@ namespace Differentiation std::enable_if_t< std::is_floating_point_v || (boost::is_complex::value && - std::is_floating_point_v::type>)>>::is_taped = + std::is_floating_point::type>::value)>>::is_taped = internal::ADNumberInfoFromEnum< typename internal::RemoveComplexWrapper::type, ADNumberTypeCode>::is_taped; @@ -954,8 +954,8 @@ namespace Differentiation std::enable_if_t< std::is_floating_point_v || (boost::is_complex::value && - std::is_floating_point_v::type>)>>::is_tapeless = + std::is_floating_point::type>::value)>>::is_tapeless = !(NumberTraits::is_taped); @@ -966,8 +966,8 @@ namespace Differentiation std::enable_if_t< std::is_floating_point_v || (boost::is_complex::value && - std::is_floating_point_v::type>)>>::is_real_valued = + std::is_floating_point::type>::value)>>::is_real_valued = (!boost::is_complex::value); @@ -978,8 +978,8 @@ namespace Differentiation std::enable_if_t< std::is_floating_point_v || (boost::is_complex::value && - std::is_floating_point_v::type>)>>::is_complex_valued = + std::is_floating_point::type>::value)>>::is_complex_valued = !(NumberTraits::is_real_valued); @@ -990,8 +990,8 @@ namespace Differentiation std::enable_if_t< std::is_floating_point_v || (boost::is_complex::value && - std::is_floating_point_v::type>)>>::n_supported_derivative_levels = + std::is_floating_point::type>::value)>>::n_supported_derivative_levels = internal::ADNumberInfoFromEnum< typename internal::RemoveComplexWrapper::type, ADNumberTypeCode>::n_supported_derivative_levels; @@ -1072,8 +1072,8 @@ namespace Differentiation std::enable_if_t< std::is_floating_point_v || (boost::is_complex::value && - std::is_floating_point_v< - typename internal::RemoveComplexWrapper::type>)>> + std::is_floating_point< + typename internal::RemoveComplexWrapper::type>::value)>> { /** * The internal number type code. @@ -1241,8 +1241,8 @@ namespace Differentiation std::enable_if_t< std::is_floating_point_v || (boost::is_complex::value && - std::is_floating_point_v::type>)>>::is_taped = false; + std::is_floating_point::type>::value)>>::is_taped = false; template @@ -1252,8 +1252,8 @@ namespace Differentiation std::enable_if_t< std::is_floating_point_v || (boost::is_complex::value && - std::is_floating_point_v::type>)>>::is_tapeless = false; + std::is_floating_point::type>::value)>>::is_tapeless = false; template @@ -1263,8 +1263,8 @@ namespace Differentiation std::enable_if_t< std::is_floating_point_v || (boost::is_complex::value && - std::is_floating_point_v::type>)>>::is_real_valued = + std::is_floating_point::type>::value)>>::is_real_valued = (!boost::is_complex::value); @@ -1275,8 +1275,8 @@ namespace Differentiation std::enable_if_t< std::is_floating_point_v || (boost::is_complex::value && - std::is_floating_point_v::type>)>>::is_complex_valued = + std::is_floating_point::type>::value)>>::is_complex_valued = !(NumberTraits::is_real_valued); @@ -1287,8 +1287,8 @@ namespace Differentiation std::enable_if_t< std::is_floating_point_v || (boost::is_complex::value && - std::is_floating_point_v::type>)>>::n_supported_derivative_levels = 0; + std::is_floating_point::type>::value)>>::n_supported_derivative_levels = 0; # else -- 2.39.5