Merge pull request #1131 from cppalliance/1116

Make construction from integral types explicit by default

Author: mborland

doc/modules/ROOT/pages/api_reference.adoc

@@ -51,6 +51,8 @@ enums, constants and macros that are provided in this library.
 | xref:config.adoc#configuration_user[`BOOST_DECIMAL_DISABLE_IOSTREAM`] | xref:config.adoc#configuration_automatic[`BOOST_DECIMAL_NO_CONSTEVAL_DETECTION`]
 | xref:config.adoc#configuration_user[`BOOST_DECIMAL_DISABLE_CLIB`] | xref:config.adoc#configuration_automatic[`BOOST_DECIMAL_HAS_STD_CHARCONV`]
 | xref:config.adoc#configuration_user[`BOOST_DECIMAL_DISABLE_EXCEPTIONS`] | xref:config.adoc#configuration_automatic[`BOOST_DECIMAL_HAS_STD_STRING_VIEW`]
+| xref:config.adoc#configuration_user[`BOOST_DECIMAL_ALLOW_IMPLICIT_INTEGER_CONVERSIONS`] |
+| xref:config.adoc#configuration_user[`BOOST_DECIMAL_ALLOW_IMPLICIT_FLOAT_CONVERSIONS`] |
 | xref:config.adoc#configuration_user[`BOOST_DECIMAL_ALLOW_IMPLICIT_CONVERSIONS`] |
 | xref:config.adoc#configuration_user[`BOOST_DECIMAL_FAST_MATH`] |
 | xref:config.adoc#configuration_user[`BOOST_DECIMAL_DEC_EVAL_METHOD`] |

doc/modules/ROOT/pages/config.adoc

@@ -22,7 +22,9 @@ The following configuration macros are available:
 - `BOOST_DECIMAL_DISABLE_EXCEPTIONS`: This allows the user to disable any calls to `throw`.
 This macro will also be set automatically in the presence of `-fno-exceptions` or various `/EH` flags on MSVC.
 
-- `BOOST_DECIMAL_ALLOW_IMPLICIT_CONVERSIONS`: Allows a binary floating-point type (e.g. `double`) to be implicitly converted to a decimal floating point type.
+- `BOOST_DECIMAL_ALLOW_IMPLICIT_INTEGER_CONVERSIONS`: Allows any integer type to be implicitly converted to any decimal type.
+
+- `BOOST_DECIMAL_ALLOW_IMPLICIT_FLOAT_CONVERSIONS`: Allows a binary floating-point type (e.g. `double`) to be implicitly converted to a decimal floating point type.
 This option is not recommended, but can be useful if you want to use specific functionality from the standard library with internal conversions such as:
 
 [source, c++]
@@ -36,6 +38,8 @@ std::complex<decimal64_t> test_val {half, half};
 const auto res = std::acos(test_val);
 ----
 
+- `BOOST_DECIMAL_ALLOW_IMPLICIT_CONVERSIONS`: Defines both `BOOST_DECIMAL_ALLOW_IMPLICIT_INTEGER_CONVERSIONS` and `BOOST_DECIMAL_ALLOW_IMPLICIT_FLOAT_CONVERSIONS`
+
 - `BOOST_DECIMAL_FAST_MATH` performs optimizations similar to that of the `-ffast-math` compiler flag such as removing all checks for non-finite values.
 This flag increases the performance of the basis operations (e.g. add, sub, mul, div, and comparisons) by up to 20%.
 Again, it must be defined before inclusion of decimal headers like so:

examples/statistics.cpp

@@ -2,6 +2,9 @@
 // Distributed under the Boost Software License, Version 1.0.
 // https://www.boost.org/LICENSE_1_0.txt
 
+// Needed for operations with boost math
+#define BOOST_DECIMAL_ALLOW_IMPLICIT_INTEGER_CONVERSIONS
+
 #include "where_file.hpp"
 #include <boost/decimal.hpp>
 #include <iostream>

include/boost/decimal/decimal128_t.hpp

@@ -218,7 +218,7 @@ BOOST_DECIMAL_EXPORT class decimal128_t final
     #else
     template <typename Float, std::enable_if_t<detail::is_floating_point_v<Float>, bool> = true>
     #endif
-    #ifndef BOOST_DECIMAL_ALLOW_IMPLICIT_CONVERSIONS
+    #if !defined(BOOST_DECIMAL_ALLOW_IMPLICIT_CONVERSIONS) && !defined(BOOST_DECIMAL_ALLOW_IMPLICIT_FLOAT_CONVERSIONS)
     explicit
     #endif
     BOOST_DECIMAL_CXX20_CONSTEXPR decimal128_t(Float val) noexcept;
@@ -243,6 +243,9 @@ BOOST_DECIMAL_EXPORT class decimal128_t final
     #else
     template <typename Integer, std::enable_if_t<detail::is_integral_v<Integer>, bool> = true>
     #endif
+    #if !defined(BOOST_DECIMAL_ALLOW_IMPLICIT_CONVERSIONS) && !defined(BOOST_DECIMAL_ALLOW_IMPLICIT_INTEGER_CONVERSIONS)
+    explicit
+    #endif
     constexpr decimal128_t(Integer val) noexcept;
 
     template <typename Integer>

include/boost/decimal/decimal32_t.hpp

@@ -224,7 +224,7 @@ BOOST_DECIMAL_EXPORT class decimal32_t final // NOLINT(cppcoreguidelines-special
     #else
     template <typename Float, std::enable_if_t<detail::is_floating_point_v<Float>, bool> = true>
     #endif
-    #ifndef BOOST_DECIMAL_ALLOW_IMPLICIT_CONVERSIONS
+    #if !defined(BOOST_DECIMAL_ALLOW_IMPLICIT_CONVERSIONS) && !defined(BOOST_DECIMAL_ALLOW_IMPLICIT_FLOAT_CONVERSIONS)
     explicit
     #endif
     BOOST_DECIMAL_CXX20_CONSTEXPR decimal32_t(Float val) noexcept;
@@ -250,6 +250,9 @@ BOOST_DECIMAL_EXPORT class decimal32_t final // NOLINT(cppcoreguidelines-special
     #else
     template <BOOST_DECIMAL_INTEGRAL Integer, std::enable_if_t<detail::is_integral_v<Integer>, bool> = true>
     #endif
+    #if !defined(BOOST_DECIMAL_ALLOW_IMPLICIT_CONVERSIONS) && !defined(BOOST_DECIMAL_ALLOW_IMPLICIT_INTEGER_CONVERSIONS)
+    explicit
+    #endif
     constexpr decimal32_t(Integer val) noexcept;
 
     template <typename Integer>

include/boost/decimal/decimal64_t.hpp

@@ -236,7 +236,7 @@ BOOST_DECIMAL_EXPORT class decimal64_t final
     #else
     template <typename Float, std::enable_if_t<detail::is_floating_point_v<Float>, bool> = true>
     #endif
-    #ifndef BOOST_DECIMAL_ALLOW_IMPLICIT_CONVERSIONS
+    #if !defined(BOOST_DECIMAL_ALLOW_IMPLICIT_CONVERSIONS) && !defined(BOOST_DECIMAL_ALLOW_IMPLICIT_FLOAT_CONVERSIONS)
     explicit
     #endif
     BOOST_DECIMAL_CXX20_CONSTEXPR decimal64_t(Float val) noexcept;
@@ -262,6 +262,9 @@ BOOST_DECIMAL_EXPORT class decimal64_t final
     #else
     template <typename Integer, std::enable_if_t<detail::is_integral_v<Integer>, bool> = true>
     #endif
+    #if !defined(BOOST_DECIMAL_ALLOW_IMPLICIT_CONVERSIONS) && !defined(BOOST_DECIMAL_ALLOW_IMPLICIT_INTEGER_CONVERSIONS)
+    explicit
+    #endif
     constexpr decimal64_t(Integer val) noexcept;
 
     template <typename Integer>

include/boost/decimal/decimal_fast128_t.hpp

@@ -183,14 +183,20 @@ BOOST_DECIMAL_EXPORT class decimal_fast128_t final
     #else
     template <typename Integer, std::enable_if_t<detail::is_integral_v<Integer>, bool> = true>
     #endif
+    #if !defined(BOOST_DECIMAL_ALLOW_IMPLICIT_CONVERSIONS) && !defined(BOOST_DECIMAL_ALLOW_IMPLICIT_INTEGER_CONVERSIONS)
+    explicit
+    #endif
     constexpr decimal_fast128_t(Integer val) noexcept;
 
     #ifdef BOOST_DECIMAL_HAS_CONCEPTS
     template <BOOST_DECIMAL_REAL Float>
     #else
     template <typename Float, std::enable_if_t<detail::is_floating_point_v<Float>, bool> = true>
     #endif
-    explicit BOOST_DECIMAL_CXX20_CONSTEXPR decimal_fast128_t(Float val) noexcept;
+    #if !defined(BOOST_DECIMAL_ALLOW_IMPLICIT_CONVERSIONS) && !defined(BOOST_DECIMAL_ALLOW_IMPLICIT_FLOAT_CONVERSIONS)
+    explicit
+    #endif
+    BOOST_DECIMAL_CXX20_CONSTEXPR decimal_fast128_t(Float val) noexcept;
 
     #ifdef BOOST_DECIMAL_UNSUPPORTED_LONG_DOUBLE
     explicit BOOST_DECIMAL_CXX20_CONSTEXPR decimal_fast128_t(long double val) noexcept = delete;

include/boost/decimal/decimal_fast32_t.hpp

@@ -159,10 +159,16 @@ BOOST_DECIMAL_EXPORT class decimal_fast32_t final
     explicit constexpr decimal_fast32_t(bool value) noexcept;
 
     template <typename Integer, std::enable_if_t<detail::is_integral_v<Integer>, bool> = true>
+    #if !defined(BOOST_DECIMAL_ALLOW_IMPLICIT_CONVERSIONS) && !defined(BOOST_DECIMAL_ALLOW_IMPLICIT_INTEGER_CONVERSIONS)
+    explicit
+    #endif
     constexpr decimal_fast32_t(Integer coeff) noexcept;
 
     template <typename Float, std::enable_if_t<detail::is_floating_point_v<Float>, bool> = true>
-    explicit BOOST_DECIMAL_CXX20_CONSTEXPR decimal_fast32_t(Float val) noexcept;
+    #if !defined(BOOST_DECIMAL_ALLOW_IMPLICIT_CONVERSIONS) && !defined(BOOST_DECIMAL_ALLOW_IMPLICIT_FLOAT_CONVERSIONS)
+    explicit
+    #endif
+    BOOST_DECIMAL_CXX20_CONSTEXPR decimal_fast32_t(Float val) noexcept;
 
     #ifdef BOOST_DECIMAL_UNSUPPORTED_LONG_DOUBLE
     explicit constexpr decimal_fast32_t(long double val) noexcept = delete;

include/boost/decimal/decimal_fast64_t.hpp

@@ -189,14 +189,20 @@ BOOST_DECIMAL_EXPORT class decimal_fast64_t final
     #else
     template <typename Integer, std::enable_if_t<detail::is_integral_v<Integer>, bool> = true>
     #endif
+    #if !defined(BOOST_DECIMAL_ALLOW_IMPLICIT_CONVERSIONS) && !defined(BOOST_DECIMAL_ALLOW_IMPLICIT_INTEGER_CONVERSIONS)
+    explicit
+    #endif
     constexpr decimal_fast64_t(Integer val) noexcept;
 
     #ifdef BOOST_DECIMAL_HAS_CONCEPTS
     template <BOOST_DECIMAL_REAL Float>
     #else
     template <typename Float, std::enable_if_t<detail::is_floating_point_v<Float>, bool> = true>
     #endif
-    explicit BOOST_DECIMAL_CXX20_CONSTEXPR decimal_fast64_t(Float val) noexcept;
+    #if !defined(BOOST_DECIMAL_ALLOW_IMPLICIT_CONVERSIONS) && !defined(BOOST_DECIMAL_ALLOW_IMPLICIT_FLOAT_CONVERSIONS)
+    explicit
+    #endif
+    BOOST_DECIMAL_CXX20_CONSTEXPR decimal_fast64_t(Float val) noexcept;
 
     #ifdef BOOST_DECIMAL_UNSUPPORTED_LONG_DOUBLE
     explicit constexpr decimal_fast64_t(long double val) noexcept = delete;

test/test_boost_math_univariate_stats.cpp

@@ -9,6 +9,9 @@
 // Propogates up from boost.math
 #define _SILENCE_CXX23_DENORM_DEPRECATION_WARNING
 
+// Needed for operations with boost math
+#define BOOST_DECIMAL_ALLOW_IMPLICIT_INTEGER_CONVERSIONS
+
 #include <boost/decimal.hpp>
 
 #if defined(__clang__)