Ticket #7075: 7075.patch

detail/mpl/gcd.hpp

@@ -20 +20 @@
 #include <boost/mpl/aux_/config/eti.hpp>
 #include <boost/mpl/aux_/config/integral.hpp>
 #include <boost/mpl/aux_/config/static_constant.hpp>
+#include <boost/mpl/aux_/config/dependent_nttp.hpp>
+#include <boost/cstdint.hpp>
 
 #if    !defined(BOOST_MPL_CFG_NO_NESTED_VALUE_ARITHMETIC_2) \
     && !defined(BOOST_MPL_PREPROCESSING_MODE) \
@@ -65 +67 @@
 {
 };
 
+// Workaround for error: the type of partial specialization template parameter constant "n2"
+// depends on another template parameter
+// Note: this solution could be wrong for n1 or n2 = [2**63 .. 2**64-1]
+#if defined(BOOST_MPL_CFG_NO_DEPENDENT_NONTYPE_PARAMETER_IN_PARTIAL_SPEC)
+
 namespace aux {
+        template< typename T1, boost::intmax_t n1, bool n1_is_0
+                , typename T2, boost::intmax_t n2, bool n2_is_0 >
+    struct gcd_aux
+        : gcd_aux<T2, n2, n2==0, T1, (n1 % n2), (n1 % n2)==0>
+    {};
+
+    template <typename T1, boost::intmax_t n1, typename T2, boost::intmax_t n2>
+    struct gcd_aux<T1, n1, false, T2, n2, true> : integral_c<T1, n1>
+    {};
+
+    template <typename T1, boost::intmax_t n1, typename T2, boost::intmax_t n2, bool C>
+    struct gcd_aux<T1, n1, true, T2, n2, C> : integral_c<T2, n2>
+    {};
+}
+
+#else // defined(BOOST_MPL_CFG_NO_DEPENDENT_NONTYPE_PARAMETER_IN_PARTIAL_SPEC)
+
+namespace aux {
     template< typename T1, T1 n1, bool n1_is_0, typename T2, T2 n2, bool n2_is_0 > 
     struct gcd_aux
  
@@ -84 +109 @@
     {};
 }
 
+#endif // defined(BOOST_MPL_CFG_NO_DEPENDENT_NONTYPE_PARAMETER_IN_PARTIAL_SPEC)
+
 template<>
 struct gcd_impl<integral_c_tag, integral_c_tag>
 {

detail/mpl/lcm.hpp

@@ -20 +20 @@
 #include <boost/mpl/aux_/config/eti.hpp>
 #include <boost/mpl/aux_/config/integral.hpp>
 #include <boost/mpl/aux_/config/static_constant.hpp>
+#include <boost/mpl/aux_/config/dependent_nttp.hpp>
+#include <boost/cstdint.hpp>
 
 #if    !defined(BOOST_MPL_CFG_NO_NESTED_VALUE_ARITHMETIC_2) \
     && !defined(BOOST_MPL_PREPROCESSING_MODE) \
@@ -66 +68 @@
 };
 
 
+// Workaround for error: the type of partial specialization template parameter constant "n2"
+// depends on another template parameter
+// Note: this solution could be wrong for n1 or n2 = [2**63 .. 2**64-1]
+#if defined(BOOST_MPL_CFG_NO_DEPENDENT_NONTYPE_PARAMETER_IN_PARTIAL_SPEC)
+
 namespace aux {
+        template< typename T1, boost::intmax_t n1, bool n1_is_0
+                        , typename T2, boost::intmax_t n2, bool n2_is_0 >
+    struct lcm_aux
+        : abs<integral_c< typename aux::largest_int<T1, T2>::type,
+            ( n1 / gcd<integral_c<T1,n1>, integral_c<T2,n2> >::value * n2 )
+        > >
+    {};
+
+    template <typename T1, boost::intmax_t n1, typename T2, boost::intmax_t n2>
+    struct lcm_aux<T1, n1, false, T2, n2, true> : integral_c<T2, 0>
+    {};
+
+    template <typename T1, boost::intmax_t n1, typename T2, boost::intmax_t n2, bool C>
+    struct lcm_aux<T1, n1, true, T2, n2, C> : integral_c<T1, 0>
+    {};
+}
+
+#else // defined(BOOST_MPL_CFG_NO_DEPENDENT_NONTYPE_PARAMETER_IN_PARTIAL_SPEC)
+
+namespace aux {
     template< typename T1, T1 n1, bool n1_is_0, typename T2, T2 n2, bool n2_is_0 > 
     struct lcm_aux
  
@@ -84 +111 @@
     {};
 }
 
+#endif // defined(BOOST_MPL_CFG_NO_DEPENDENT_NONTYPE_PARAMETER_IN_PARTIAL_SPEC)
+
 template<>
 struct lcm_impl<integral_c_tag, integral_c_tag>
 {