From ee9db7a5ad8e0e8162eb59e3b8da50b52dde8f39 Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Thu, 4 Nov 2021 11:17:46 +0000
Subject: [PATCH] [math] Use integer type in Factorial and deprecate struct
version (use factorial function)
Using an enum has the side effect that you can't do arithmetic without explicitly casting to an integer type.
This also produced a compiler warning with clang 10 "arithmetic between different enumeration types is deprecated"
-Wdeprecated-anon-enum-enum-conversion
---
CHANGELOG.md | 3 ++-
dune/common/math.hh | 7 ++++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c57b96258..c97718d92 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
- Add `pragma omp simd` annotations in the LoopSIMD class to improve compiler optimizations
+- deprecate Factorial in common/math.hh (use factorial function)
+
## Build System
- Remove the variable `DUNE_DEFAULT_LIBS`
@@ -21,7 +23,6 @@
- Remove deprecated cmake function overload `target_link_libraries`
-
# Release 2.8
- Set minimal required CMake version in cmake to >= 3.13.
diff --git a/dune/common/math.hh b/dune/common/math.hh
index c3f3dc877..da37205b7 100644
--- a/dune/common/math.hh
+++ b/dune/common/math.hh
@@ -86,19 +86,20 @@ namespace Dune
}
//! Calculates the factorial of m at compile time
+ //! \deprecated Will be removed after release 2.9
template <int m>
struct Factorial
{
//! factorial stores m!
- enum { factorial = m * Factorial<m-1>::factorial };
+ static constexpr int factorial = m * Factorial<m-1>::factorial;
};
//! end of recursion of factorial via specialization
template <>
- struct Factorial<0>
+ struct [[deprecated("Use function factorial instead! Will be removed after Dune 2.9")]] Factorial<0>
{
// 0! = 1
- enum { factorial = 1 };
+ static constexpr int factorial = 1;
};
--
GitLab