2009-04-06 Paolo Carlini <paolo.carlini@oracle.com>

	* include/bits/random.tcc (linear_congruential_engine<>::
	seed(seed_seq&)): Fix typo in last fix for __m == 0.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@145605 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 62c7411..d2b1cd6 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,10 @@
 2009-04-06  Paolo Carlini  <paolo.carlini@oracle.com>
 
+       * include/bits/random.tcc (linear_congruential_engine<>::
+       seed(seed_seq&)): Fix typo in last fix for __m == 0.
+
+2009-04-06  Paolo Carlini  <paolo.carlini@oracle.com>
+
        * include/bits/random.h (operator==): Mark all inline.
        (mersenne_twister_engine): Enable #if 0 checks.
 

diff --git a/libstdc++-v3/include/bits/random.tcc b/libstdc++-v3/include/bits/random.tcc
index b6a2543..ee2b71c 100644 (file)
--- a/libstdc++-v3/include/bits/random.tcc
+++ b/libstdc++-v3/include/bits/random.tcc
@@ -119,8 +119,8 @@ namespace std
     seed(seed_seq& __q)
     {
       const _UIntType __k0 = __m == 0 ? std::numeric_limits<_UIntType>::digits
-                                     : (std::__lg(__m) + 31);
-      const _UIntType __k = __k0 / 32;
+                                     : std::__lg(__m);
+      const _UIntType __k = (__k0 + 31) / 32;
       _UIntType __arr[__k + 3];
       __q.generate(__arr + 0, __arr + 3);
       _UIntType __factor = 1U;