aboutsummaryrefslogtreecommitdiff
path: root/libstdc++-v3
diff options
context:
space:
mode:
authorPaolo Carlini <paolo.carlini@oracle.com>2013-09-03 10:12:19 +0000
committerPaolo Carlini <paolo@gcc.gnu.org>2013-09-03 10:12:19 +0000
commite5fbc9fc7227c3e48382af33830db16982ec76f9 (patch)
treef54d3587bdaa0cc19583efffe25b3d1c4bf24ddc /libstdc++-v3
parent84aafcc206ffa11d38c7e5bd2c7d68fcf58ca17b (diff)
downloadgcc-e5fbc9fc7227c3e48382af33830db16982ec76f9.zip
gcc-e5fbc9fc7227c3e48382af33830db16982ec76f9.tar.gz
gcc-e5fbc9fc7227c3e48382af33830db16982ec76f9.tar.bz2
re PR libstdc++/58302 (compilation error : std::negative_binomial_distribution::operator(e, p))
2013-09-03 Paolo Carlini <paolo.carlini@oracle.com> PR libstdc++/58302 * include/bits/random.tcc (negative_binomial_distribution<>:: operator()(_UniformRandomNumberGenerator&, const param_type&): Fix typo in template argument. * testsuite/26_numerics/random/negative_binomial_distribution/ operators/58302.cc: New. From-SVN: r202208
Diffstat (limited to 'libstdc++-v3')
-rw-r--r--libstdc++-v3/ChangeLog9
-rw-r--r--libstdc++-v3/include/bits/random.tcc2
-rw-r--r--libstdc++-v3/testsuite/26_numerics/random/negative_binomial_distribution/operators/58302.cc34
3 files changed, 44 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index cd36569..50d65dd 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,12 @@
+2013-09-03 Paolo Carlini <paolo.carlini@oracle.com>
+
+ PR libstdc++/58302
+ * include/bits/random.tcc (negative_binomial_distribution<>::
+ operator()(_UniformRandomNumberGenerator&, const param_type&):
+ Fix typo in template argument.
+ * testsuite/26_numerics/random/negative_binomial_distribution/
+ operators/58302.cc: New.
+
2013-09-02 Tim Shen <timshen91@gmail.com>
* regex_automaton.h: Rearrange _NFA's layout.
diff --git a/libstdc++-v3/include/bits/random.tcc b/libstdc++-v3/include/bits/random.tcc
index c6db5b4..10c6550 100644
--- a/libstdc++-v3/include/bits/random.tcc
+++ b/libstdc++-v3/include/bits/random.tcc
@@ -1291,7 +1291,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
operator()(_UniformRandomNumberGenerator& __urng,
const param_type& __p)
{
- typedef typename std::gamma_distribution<result_type>::param_type
+ typedef typename std::gamma_distribution<double>::param_type
param_type;
const double __y =
diff --git a/libstdc++-v3/testsuite/26_numerics/random/negative_binomial_distribution/operators/58302.cc b/libstdc++-v3/testsuite/26_numerics/random/negative_binomial_distribution/operators/58302.cc
new file mode 100644
index 0000000..3ced018
--- /dev/null
+++ b/libstdc++-v3/testsuite/26_numerics/random/negative_binomial_distribution/operators/58302.cc
@@ -0,0 +1,34 @@
+// { dg-do compile }
+// { dg-options "-std=gnu++11" }
+// { dg-require-cstdint "" }
+//
+// Copyright (C) 2013 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/>.
+
+#include <random>
+
+void test01()
+{
+ typedef std::negative_binomial_distribution<> dist_type;
+
+ std::default_random_engine engine;
+
+ dist_type dist;
+ dist_type::param_type param(3, 0.5);
+
+ dist(engine, param); // compile error!
+}