Make all table static const c-arrays instead of constexpr

Break change as it is now not constexpr

Author: mborland

include/boost/math/special_functions/prime.hpp

@@ -10,13 +10,12 @@
 
 #include <boost/math/policies/error_handling.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
-#include <array>
 #include <cstdint>
 
 namespace boost{ namespace math{
 
    template <class Policy>
-   BOOST_MATH_CONSTEXPR_TABLE_FUNCTION std::uint32_t prime(unsigned n, const Policy& pol)
+   inline std::uint32_t prime(unsigned n, const Policy& pol)
    {
       //
       // This is basically three big tables which together
@@ -26,29 +25,20 @@ namespace boost{ namespace math{
       // That gives us the first 10000 primes with the largest
       // being 104729:
       //
-#ifdef BOOST_MATH_HAVE_CONSTEXPR_TABLES
       constexpr unsigned b1 = 53;
       constexpr unsigned b2 = 6541;
       constexpr unsigned b3 = 10000;
-      constexpr std::array<unsigned char, 54> a1 = {{
-#else
-      static const unsigned b1 = 53;
-      static const unsigned b2 = 6541;
-      static const unsigned b3 = 10000;
-      static const std::array<unsigned char, 54> a1 = {{
-#endif
+
+      static const unsigned char a1[] = {
          2u, 3u, 5u, 7u, 11u, 13u, 17u, 19u, 23u, 29u, 31u, 
          37u, 41u, 43u, 47u, 53u, 59u, 61u, 67u, 71u, 73u, 
          79u, 83u, 89u, 97u, 101u, 103u, 107u, 109u, 113u, 
          127u, 131u, 137u, 139u, 149u, 151u, 157u, 163u, 
          167u, 173u, 179u, 181u, 191u, 193u, 197u, 199u, 
          211u, 223u, 227u, 229u, 233u, 239u, 241u, 251u
-      }};
-#ifdef BOOST_MATH_HAVE_CONSTEXPR_TABLES
-      constexpr std::array<std::uint16_t, 6488> a2 = {{
-#else      
-      static const std::array<std::uint16_t, 6488> a2 = {{
-#endif
+      };
+
+      static const std::uint16_t a2[] = {
          257u, 263u, 269u, 271u, 277u, 281u, 283u, 293u, 
          307u, 311u, 313u, 317u, 331u, 337u, 347u, 349u, 353u, 
          359u, 367u, 373u, 379u, 383u, 389u, 397u, 401u, 409u, 
@@ -770,12 +760,9 @@ namespace boost{ namespace math{
          65203u, 65213u, 65239u, 65257u, 65267u, 65269u, 65287u, 65293u, 65309u, 
          65323u, 65327u, 65353u, 65357u, 65371u, 65381u, 65393u, 65407u, 65413u, 
          65419u, 65423u, 65437u, 65447u, 65449u, 65479u, 65497u, 65519u, 65521u
-      }};
-#ifdef BOOST_MATH_HAVE_CONSTEXPR_TABLES
-      constexpr std::array<std::uint16_t, 3458> a3 = {{
-#else
-      static const std::array<std::uint16_t, 3458> a3 = {{
-#endif
+      };
+
+      static const std::uint16_t a3[] = {
          2u, 4u, 8u, 16u, 22u, 28u, 44u, 
          46u, 52u, 64u, 74u, 82u, 94u, 98u, 112u, 
          116u, 122u, 142u, 152u, 164u, 166u, 172u, 178u, 
@@ -1209,7 +1196,7 @@ namespace boost{ namespace math{
          39016u, 39026u, 39044u, 39058u, 39062u, 39088u, 39104u, 39116u, 
          39124u, 39142u, 39146u, 39148u, 39158u, 39166u, 39172u, 39176u, 
          39182u, 39188u, 39194u
-      }};
+      };
 
       if(n <= b1)
          return a1[n];
@@ -1223,12 +1210,12 @@ namespace boost{ namespace math{
       return static_cast<std::uint32_t>(a3[n - b2 - 1]) + 0xFFFFu;
    }
 
-   inline BOOST_MATH_CONSTEXPR_TABLE_FUNCTION std::uint32_t prime(unsigned n)
+   inline std::uint32_t prime(unsigned n)
    {
       return boost::math::prime(n, boost::math::policies::policy<>());
    }
 
-   static const unsigned max_prime = 9999;
+   constexpr unsigned max_prime = 9999;
 
 }} // namespace boost and math
 

test/compile_test/sf_prime_incl_test.cpp

@@ -17,13 +17,5 @@
 void compile_and_link_test()
 {
    check_result<std::uint32_t>(boost::math::prime(u));
-   //
-   // Add constexpr tests here:
-   //
-#ifdef BOOST_MATH_HAVE_CONSTEXPR_TABLES
-   constexpr std::uint32_t ce_f = boost::math::prime(boost::math::max_prime);
-   static_assert(ce_f == 104729, "max_prime had incorrect value");
-   check_result<std::uint32_t>(ce_f);
-#endif
 }