[lmi-commits] [lmi] master 1c7d291 1/2: Use 'static' with 'constexpr' only for good reason

[Greg Chicares]

branch: master
commit 1c7d29114a8149672ac4aa01d98d9edb077b6bc3
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Use 'static' with 'constexpr' only for good reason
    
    See:
      https://lists.nongnu.org/archive/html/lmi/2021-06/msg00019.html
---
 currency_test.cpp | 4 ++--
 ihs_avsolve.cpp   | 2 +-
 ihs_basicval.cpp  | 4 ++--
 zero.hpp          | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/currency_test.cpp b/currency_test.cpp
index 02150dd..e01901b 100644
--- a/currency_test.cpp
+++ b/currency_test.cpp
@@ -287,7 +287,7 @@ void currency_test::test_round_currency()
 
 void currency_test::mete_humongous()
 {
-    static constexpr double d0 = std::numeric_limits<double>::max();
+    constexpr double d0 {std::numeric_limits<double>::max()};
     static currency const extreme = from_cents(d0);
     static currency const value   = from_cents(1234567);
     for(int i = 0; i < 100000; ++i)
@@ -298,7 +298,7 @@ void currency_test::mete_humongous()
 
 void currency_test::mete_infinite()
 {
-    static constexpr double d0 = std::numeric_limits<double>::infinity();
+    constexpr double d0 {std::numeric_limits<double>::infinity()};
     static currency const extreme = from_cents(d0);
     static currency const value   = from_cents(1234567);
     for(int i = 0; i < 100000; ++i)
diff --git a/ihs_avsolve.cpp b/ihs_avsolve.cpp
index ed076be..ed1730b 100644
--- a/ihs_avsolve.cpp
+++ b/ihs_avsolve.cpp
@@ -263,7 +263,7 @@ currency AccountValue::SolveTest
 
     if(mce_solve_for_non_mec == SolveTarget_)
         {
-        static constexpr currency C100 = 100_cents;
+        constexpr currency C100 {100_cents};
         return InvariantValues().IsMec ? -C100 : C100;
         }
 
diff --git a/ihs_basicval.cpp b/ihs_basicval.cpp
index a67ccce..0e33ade 100644
--- a/ihs_basicval.cpp
+++ b/ihs_basicval.cpp
@@ -1939,7 +1939,7 @@ std::vector<double> BasicValues::GetCurrCOIRates0() const
 
 std::vector<double> BasicValues::GetCurrCOIRates1() const
 {
-    static constexpr double dbl_inf = std::numeric_limits<double>::infinity();
+    constexpr double dbl_inf {std::numeric_limits<double>::infinity()};
     static const currency inf = from_cents(dbl_inf);
     return GetTable
         (product().datum("CurrCOIFilename")
@@ -1952,7 +1952,7 @@ std::vector<double> BasicValues::GetCurrCOIRates1() const
 
 std::vector<double> BasicValues::GetCurrCOIRates2() const
 {
-    static constexpr double dbl_inf = std::numeric_limits<double>::infinity();
+    constexpr double dbl_inf {std::numeric_limits<double>::infinity()};
     static const currency inf = from_cents(dbl_inf);
     return GetTable
         (product().datum("CurrCOIFilename")
diff --git a/zero.hpp b/zero.hpp
index 4ff1dd4..f72a1a7 100644
--- a/zero.hpp
+++ b/zero.hpp
@@ -262,7 +262,7 @@ root_type decimal_root
     ,std::ostream&   os_trace = null_stream()
     )
 {
-    static constexpr double epsilon   {std::numeric_limits<double>::epsilon()};
+    constexpr double        epsilon   {std::numeric_limits<double>::epsilon()};
 
     round_to<double> const  round_dec {decimals, r_to_nearest};
 
@@ -428,7 +428,7 @@ double brent_zero
     ,FunctionalType& f
     )
 {
-    double const epsilon = std::numeric_limits<double>::epsilon();
+    constexpr double epsilon {std::numeric_limits<double>::epsilon()};
 
     // Returns a zero of the function f in [a,b] to within a tolerance
     //   6 * epsilon * |z| + 2 * t