aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Salmon <john.salmon@deshaw.com>2011-09-24 22:34:50 +0000
committerPaolo Carlini <paolo@gcc.gnu.org>2011-09-24 22:34:50 +0000
commit82582df651c4e344e459ae228d690e00d8967e9f (patch)
treea8e66df37ebd48f02bc71484bebbe2f52e066d4c
parent655ae828ee2810a2247d859d1975c4f523632fd3 (diff)
downloadgcc-82582df651c4e344e459ae228d690e00d8967e9f.zip
gcc-82582df651c4e344e459ae228d690e00d8967e9f.tar.gz
gcc-82582df651c4e344e459ae228d690e00d8967e9f.tar.bz2
re PR libstdc++/50510 ([C++0x] transposed variable names in std::seed_seq::generate)
2011-09-24 John Salmon <john.salmon@deshaw.com> PR libstdc++/50510 * include/bits/random.tcc (seed_seq::generate): Fix computation. From-SVN: r179149
-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 67643de..9add722 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,10 @@
2011-09-24 John Salmon <john.salmon@deshaw.com>
+ PR libstdc++/50510
+ * include/bits/random.tcc (seed_seq::generate): Fix computation.
+
+2011-09-24 John Salmon <john.salmon@deshaw.com>
+
PR libstdc++/50509
* include/bits/random.tcc (seed_seq::generate): Fix computation.
diff --git a/libstdc++-v3/include/bits/random.tcc b/libstdc++-v3/include/bits/random.tcc
index d35f2f4..0e74848 100644
--- a/libstdc++-v3/include/bits/random.tcc
+++ b/libstdc++-v3/include/bits/random.tcc
@@ -2796,8 +2796,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_Type __r4 = __r3 - __k % __n;
__r4 = __detail::__mod<_Type,
__detail::_Shift<_Type, 32>::__value>(__r4);
- __begin[(__k + __p) % __n] ^= __r4;
- __begin[(__k + __q) % __n] ^= __r3;
+ __begin[(__k + __p) % __n] ^= __r3;
+ __begin[(__k + __q) % __n] ^= __r4;
__begin[__k % __n] = __r4;
}
}