Fix a couple of bugs in linear_congruential_engine::seed. Regression test added.
llvm-svn: 182421
Cr-Mirrored-From: sso://chromium.googlesource.com/_direct/external/github.com/llvm/llvm-project
Cr-Mirrored-Commit: 849821cffb2fe404593450b7b067bee8704bcb4d
diff --git a/include/random b/include/random
index 92722ea..f1076f9 100644
--- a/include/random
+++ b/include/random
@@ -1835,7 +1835,7 @@
// types
typedef _UIntType result_type;
-private:
+//private:
result_type __x_;
static _LIBCPP_CONSTEXPR const result_type _Mp = result_type(~0);
@@ -1880,7 +1880,7 @@
seed(_Sseq& __q)
{__seed(__q, integral_constant<unsigned,
1 + (__m == 0 ? (sizeof(result_type) * __CHAR_BIT__ - 1)/32
- : (__m-1) / 0x100000000ull)>());}
+ : (__m > 0x100000000ull))>());}
// generating functions
_LIBCPP_INLINE_VISIBILITY
@@ -1969,7 +1969,7 @@
uint32_t __ar[__k+3];
__q.generate(__ar, __ar + __k + 3);
result_type __s = static_cast<result_type>((__ar[3] +
- (uint64_t)__ar[4] << 32) % __m);
+ ((uint64_t)__ar[4] << 32)) % __m);
__x_ = __c == 0 && __s == 0 ? result_type(1) : __s;
}
diff --git a/test/numerics/rand/rand.eng/rand.eng.lcong/seed_sseq.pass.cpp b/test/numerics/rand/rand.eng/rand.eng.lcong/seed_sseq.pass.cpp
index 470726f..ca2793c 100644
--- a/test/numerics/rand/rand.eng/rand.eng.lcong/seed_sseq.pass.cpp
+++ b/test/numerics/rand/rand.eng/rand.eng.lcong/seed_sseq.pass.cpp
@@ -28,4 +28,12 @@
e1.seed(sseq);
assert(e1 == e2);
}
+ {
+ unsigned a[] = {3, 5, 7, 9, 11};
+ std::seed_seq sseq(a, a+5);
+ typedef std::linear_congruential_engine<unsigned long long, 1, 1, 0x200000001ULL> E;
+ E e1(4309005589);
+ E e2(sseq);
+ assert(e1 == e2);
+ }
}