summaryrefslogtreecommitdiff
path: root/libstdc++-v3
diff options
context:
space:
mode:
authorPaolo Carlini <paolo.carlini@oracle.com>2009-04-06 14:50:06 +0000
committerPaolo Carlini <paolo@gcc.gnu.org>2009-04-06 14:50:06 +0000
commit1ae3576fa412634f1a4d8dcfe949531b8e7990da (patch)
tree8c8beddd312e53555e1a9318e6377fa67f902660 /libstdc++-v3
parent4bad83f55a7df9d7ee7660e4be87245da4aa8b69 (diff)
downloadgcc-1ae3576fa412634f1a4d8dcfe949531b8e7990da.tar.gz
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.tcc (linear_congruential_engine<>:: seed(seed_seq&)): Fix typo in last fix for __m == 0. From-SVN: r145605
Diffstat (limited to 'libstdc++-v3')
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/include/bits/random.tcc4
2 files changed, 7 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 62c741154ba..d2b1cd656c5 100644
--- 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 b6a25434bf3..ee2b71c6f33 100644
--- 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;