From: John Salmon <john.salmon@deshaw.com>
Date: Sat, 24 Sep 2011 22:34:50 +0000 (+0000)
Subject: re PR libstdc++/50510 ([C++0x] transposed variable names in std::seed_seq::generate)
X-Git-Tag: releases/gcc-4.7.0~3600
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=82582df651c4e344e459ae228d690e00d8967e9f;p=thirdparty%2Fgcc.git

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
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 67643de3ef62..9add722014ee 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+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
diff --git a/libstdc++-v3/include/bits/random.tcc b/libstdc++-v3/include/bits/random.tcc
index d35f2f4cf9a4..0e74848ff3c4 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;
 	}
     }