aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2018-06-15 17:11:12 +0100
committerJonathan Wakely <redi@gcc.gnu.org>2018-06-15 17:11:12 +0100
commit3438bf7b9f5ce1cfbb7e2419da25e72f109ea480 (patch)
treeb7a4364369ce189f7777ea1245d2d6abd43cc71a
parent9e9e626420ee11c9c1e63a40a3e957cd145744d4 (diff)
downloadgcc-3438bf7b9f5ce1cfbb7e2419da25e72f109ea480.zip
gcc-3438bf7b9f5ce1cfbb7e2419da25e72f109ea480.tar.gz
gcc-3438bf7b9f5ce1cfbb7e2419da25e72f109ea480.tar.bz2
PR libstdc++/86168 fix ambiguous default constructor
PR libstdc++/86168 * include/bits/random.h (random_device(const string&)): Remove default argument. From-SVN: r261636
-rw-r--r--libstdc++-v3/ChangeLog4
-rw-r--r--libstdc++-v3/include/bits/random.h2
2 files changed, 5 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index cf6bfc9..482f64e 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,9 @@
2018-06-15 Jonathan Wakely <jwakely@redhat.com>
+ PR libstdc++/86168
+ * include/bits/random.h (random_device(const string&)): Remove
+ default argument.
+
* include/bits/char_traits.h (__cpp_lib_constexpr_char_traits): Only
define for C++17 and above.
diff --git a/libstdc++-v3/include/bits/random.h b/libstdc++-v3/include/bits/random.h
index 738c62f..e59c8b0 100644
--- a/libstdc++-v3/include/bits/random.h
+++ b/libstdc++-v3/include/bits/random.h
@@ -1614,7 +1614,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
random_device() { _M_init("mt19937"); }
explicit
- random_device(const std::string& __token = "mt19937")
+ random_device(const std::string& __token)
{ _M_init_pretr1(__token); }
#endif