From 3438bf7b9f5ce1cfbb7e2419da25e72f109ea480 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 15 Jun 2018 17:11:12 +0100 Subject: [PATCH] PR libstdc++/86168 fix ambiguous default constructor PR libstdc++/86168 * include/bits/random.h (random_device(const string&)): Remove default argument. From-SVN: r261636 --- libstdc++-v3/ChangeLog | 4 ++++ libstdc++-v3/include/bits/random.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index cf6bfc9509a..482f64ee460 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,9 @@ 2018-06-15 Jonathan Wakely + 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 738c62fccd1..e59c8b0221d 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 -- 2.30.2