OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR libstdc++/33128 (std::tr1::uniform_int returns value out of range) 

2007-08-28  Paolo Carlini  <pcarlini@suse.de>

	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: r127849
This commit is contained in:
Paolo Carlini 2007-08-28 08:48:24 +00:00 committed by Paolo Carlini
parent 46dc0789fe
commit 44d5230cc3
3 changed files with 56 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,11 @@
2007-08-28 Paolo Carlini <pcarlini@suse.de>
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.
2007-08-24 Benjamin Kosnik <bkoz@redhat.com>
* acinclude.m4: Fix duplicate variable names.

6
libstdc++-v3/include/tr1_impl/random
View File

@ -1604,7 +1604,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<typename
_UniformRandomNumberGenerator::result_type>::__type __utype;
return result_type(__utype(__urng()) % (__max - __min + 1)) + __min;
}
template<typename _UniformRandomNumberGenerator>
result_type

43
libstdc++-v3/testsuite/tr1/5_numerical_facilities/random/uniform_int/33128.cc Normal file
View File

@ -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 <tr1/random>
#include <testsuite_hooks.h>
// libstdc++/33128
int test01()
{
bool test __attribute__((unused)) = true;
std::tr1::mt19937 rng;
std::tr1::uniform_int<> six(1,6);
std::tr1::variate_generator<std::tr1::mt19937, std::tr1::uniform_int<> >
die(rng, six);
int val = die();
VERIFY( val >= 1 && val <= 6 );
}
int main()
{
test01();
return 0;
}