From 7169587a7ccdfef5fb13ea6975ecba4063d0b004 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Tue, 28 Aug 2007 08:48:54 +0000 Subject: [PATCH] re PR libstdc++/33128 (std::tr1::uniform_int returns value out of range) 2007-08-28 Paolo Carlini PR libstdc++/33128 * include/tr1_impl/random (uniform_int<>::_M_call): Deal with __urng() returning negative values. * testsuite/tr1/5_numerical_facilities/random/uniform_int/33128.cc: New. From-SVN: r127850 --- libstdc++-v3/ChangeLog | 8 ++++ libstdc++-v3/include/tr1/random | 6 ++- .../random/uniform_int/33128.cc | 43 +++++++++++++++++++ 3 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 libstdc++-v3/testsuite/tr1/5_numerical_facilities/random/uniform_int/33128.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 0069cc39130e..d915bcf66fbe 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +2007-08-28 Paolo Carlini + + PR libstdc++/33128 + * include/tr1/random (uniform_int<>::_M_call): Deal with + __urng() returning negative values. + * testsuite/tr1/5_numerical_facilities/random/uniform_int/33128.cc: + New. + 2007-08-17 Johannes Willkomm PR libstdc++/33084 diff --git a/libstdc++-v3/include/tr1/random b/libstdc++-v3/include/tr1/random index 56ea508575d3..c97f16d2a2d7 100644 --- a/libstdc++-v3/include/tr1/random +++ b/libstdc++-v3/include/tr1/random @@ -1618,7 +1618,11 @@ _GLIBCXX_BEGIN_NAMESPACE(tr1) result_type _M_call(_UniformRandomNumberGenerator& __urng, result_type __min, result_type __max, true_type) - { return result_type(__urng() % (__max - __min + 1)) + __min; } + { + typedef typename __gnu_cxx::__add_unsigned::__type __utype; + return result_type(__utype(__urng()) % (__max - __min + 1)) + __min; + } template result_type diff --git a/libstdc++-v3/testsuite/tr1/5_numerical_facilities/random/uniform_int/33128.cc b/libstdc++-v3/testsuite/tr1/5_numerical_facilities/random/uniform_int/33128.cc new file mode 100644 index 000000000000..bf10eddbf7d6 --- /dev/null +++ b/libstdc++-v3/testsuite/tr1/5_numerical_facilities/random/uniform_int/33128.cc @@ -0,0 +1,43 @@ +// Copyright (C) 2007 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 2, or (at your option) +// any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING. If not, write to the Free +// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +// USA. + +// 5.1.7.1 Class template uniform_int +// 5.1.1 [7] Table 17 + +#include +#include + +// libstdc++/33128 +int test01() +{ + bool test __attribute__((unused)) = true; + + std::tr1::mt19937 rng; + std::tr1::uniform_int<> six(1,6); + std::tr1::variate_generator > + die(rng, six); + + int val = die(); + VERIFY( val >= 1 && val <= 6 ); +} + +int main() +{ + test01(); + return 0; +} -- 2.47.2