diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2010-10-12 13:35:22 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2010-10-12 13:35:22 +0000 |
| commit | d3a7350497a38cbf99bdd4a5ec11bdbb8f732298 (patch) | |
| tree | 665ac82091f6e9d408cfc6f83ab9733db92b1094 /libstdc++-v3 | |
| parent | a81f4b678524dbc3c3614f785c5bfee0944ce522 (diff) | |
| download | gcc-d3a7350497a38cbf99bdd4a5ec11bdbb8f732298.zip gcc-d3a7350497a38cbf99bdd4a5ec11bdbb8f732298.tar.gz gcc-d3a7350497a38cbf99bdd4a5ec11bdbb8f732298.tar.bz2 | |
random.tcc (piecewise_linear_distribution<>:: operator()): Don't crash when the dist is default-constructed.
2010-10-12 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/random.tcc (piecewise_linear_distribution<>::
operator()): Don't crash when the dist is default-constructed.
* testsuite/26_numerics/random/piecewise_linear_distribution/
operators/call-default.cc: New.
From-SVN: r165379
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 7 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/random.tcc | 3 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/26_numerics/random/piecewise_linear_distribution/operators/call-default.cc | 41 |
3 files changed, 51 insertions, 0 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 14d834e..b6bd2ef 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2010-10-12 Paolo Carlini <paolo.carlini@oracle.com> + + * include/bits/random.tcc (piecewise_linear_distribution<>:: + operator()): Don't crash when the dist is default-constructed. + * testsuite/26_numerics/random/piecewise_linear_distribution/ + operators/call-default.cc: New. + 2010-10-11 Jonathan Wakely <jwakely.gcc@gmail.com> * testsuite/23_containers/bitset/cons/2.cc: Tweak. diff --git a/libstdc++-v3/include/bits/random.tcc b/libstdc++-v3/include/bits/random.tcc index 9312038..d360b41 100644 --- a/libstdc++-v3/include/bits/random.tcc +++ b/libstdc++-v3/include/bits/random.tcc @@ -2623,6 +2623,9 @@ namespace std __aurng(__urng); const double __p = __aurng(); + if (__param._M_m.empty()) + return __p; + auto __pos = std::lower_bound(__param._M_cp.begin(), __param._M_cp.end(), __p); const size_t __i = __pos - __param._M_cp.begin(); diff --git a/libstdc++-v3/testsuite/26_numerics/random/piecewise_linear_distribution/operators/call-default.cc b/libstdc++-v3/testsuite/26_numerics/random/piecewise_linear_distribution/operators/call-default.cc new file mode 100644 index 0000000..426c4d8 --- /dev/null +++ b/libstdc++-v3/testsuite/26_numerics/random/piecewise_linear_distribution/operators/call-default.cc @@ -0,0 +1,41 @@ +// { dg-options "-std=c++0x" } +// { dg-require-cstdint "" } +// +// 2010-10-12 Paolo Carlini <paolo.carlini@oracle.com> +// +// Copyright (C) 2010 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 3, 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 COPYING3. If not see +// <http://www.gnu.org/licenses/>. + +// 26.5.8.5.3 Class template piecewise_linear_distribution +// [rand.dist.samp.plinear] + +#include <random> + +void +test01() +{ + std::piecewise_linear_distribution<> u; + std::minstd_rand0 rng; + + u(rng); +} + +int main() +{ + test01(); + return 0; +} |