comparison DEPENDENCIES/generic/include/boost/random/detail/large_arithmetic.hpp @ 101:c530137014c0

Update Boost headers (1.58.0)

  * accompanying file LICENSE_1_0.txt or copy at
  * http://www.boost.org/LICENSE_1_0.txt)
  *
  * See http://www.boost.org for most recent version including documentation.
  *
- * $Id: large_arithmetic.hpp 71018 2011-04-05 21:27:52Z steven_watanabe $
+ * $Id$
  */
 
 #ifndef BOOST_RANDOM_DETAIL_LARGE_ARITHMETIC_HPP
 #define BOOST_RANDOM_DETAIL_LARGE_ARITHMETIC_HPP
 

     boost::uintmax_t remainder;
 };
 
 inline div_t muldivmod(boost::uintmax_t a, boost::uintmax_t b, boost::uintmax_t m)
 {
-    static const int bits =
+    const int bits =
         ::std::numeric_limits< ::boost::uintmax_t>::digits / 2;
-    static const ::boost::uintmax_t mask = (::boost::uintmax_t(1) << bits) - 1;
+    const ::boost::uintmax_t mask = (::boost::uintmax_t(1) << bits) - 1;
     typedef ::boost::uint_t<bits>::fast digit_t;
 
     int shift = std::numeric_limits< ::boost::uintmax_t>::digits - 1
         - detail::integer_log2(m);
 

         q -= error;
         rem = rem + error * m - diff;
 
         quotient[i - 2] = q;
         product[i] = 0;
-        product[i-1] = (rem >> bits) & mask;
-        product[i-2] = rem & mask;
+        product[i-1] = static_cast<digit_t>((rem >> bits) & mask);
+        product[i-2] = static_cast<digit_t>(rem & mask);
     }
 
     div_t result = {
         ((::boost::uintmax_t(quotient[1]) << bits) | quotient[0]),
         ((::boost::uintmax_t(product[1]) << bits) | product[0]) >> shift,