From b1883d9cbf2dfa8452ebb109d580096453f7e10f Mon Sep 17 00:00:00 2001 From: Timo Heister Date: Thu, 21 Jul 2022 10:12:03 -0400 Subject: [PATCH] qualify namspace for MSVC otherwise MSVC tries to use numbers::internal from signaling_nan.h --- include/deal.II/base/numbers.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/include/deal.II/base/numbers.h b/include/deal.II/base/numbers.h index 2832dad638..e3a5a00cf3 100644 --- a/include/deal.II/base/numbers.h +++ b/include/deal.II/base/numbers.h @@ -836,8 +836,8 @@ namespace numbers values_are_equal(const adouble &value_1, const Number &value_2) { // Use the specialized definition for two ADOL-C taped types - return values_are_equal(value_1, - internal::NumberType::value(value_2)); + return values_are_equal( + value_1, dealii::internal::NumberType::value(value_2)); } @@ -892,7 +892,7 @@ namespace numbers { // Use the specialized definition for two ADOL-C taped types return value_is_less_than(value_1, - internal::NumberType::value(value_2)); + ::internal::NumberType::value(value_2)); } @@ -912,8 +912,8 @@ namespace numbers value_is_less_than(const Number &value_1, const adouble &value_2) { // Use the specialized definition for two ADOL-C taped types - return value_is_less_than(internal::NumberType::value(value_1), - value_2); + return value_is_less_than( + dealii::internal::NumberType::value(value_1), value_2); } #endif @@ -923,7 +923,7 @@ namespace numbers constexpr bool values_are_equal(const Number1 &value_1, const Number2 &value_2) { - return (value_1 == internal::NumberType::value(value_2)); + return (value_1 == dealii::internal::NumberType::value(value_2)); } @@ -947,7 +947,7 @@ namespace numbers inline bool value_is_less_than(const Number1 &value_1, const Number2 &value_2) { - return (value_1 < internal::NumberType::value(value_2)); + return (value_1 < dealii::internal::NumberType::value(value_2)); } -- 2.39.5