aboutsummaryrefslogtreecommitdiff
path: root/libstdc++-v3
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2015-05-13 14:54:40 +0100
committerJonathan Wakely <redi@gcc.gnu.org>2015-05-13 14:54:40 +0100
commite6508eaf6925e46585ac87ac83406457414022a7 (patch)
treee93e624880410ed6709af7cdf12d4366a430587e /libstdc++-v3
parentbcb896abe8e24ddf1f120e66bea6cd16e3fd0ca3 (diff)
downloadgcc-e6508eaf6925e46585ac87ac83406457414022a7.zip
gcc-e6508eaf6925e46585ac87ac83406457414022a7.tar.gz
gcc-e6508eaf6925e46585ac87ac83406457414022a7.tar.bz2
future (packaged_task(allocator_arg_t, const A&, F&&): Remove explicit (LWG 2407).
* include/std/future (packaged_task(allocator_arg_t, const A&, F&&): Remove explicit (LWG 2407). From-SVN: r223161
Diffstat (limited to 'libstdc++-v3')
-rw-r--r--libstdc++-v3/ChangeLog3
-rw-r--r--libstdc++-v3/include/std/future2
2 files changed, 4 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 3d20ad4..34bda01 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,8 @@
2015-05-13 Jonathan Wakely <jwakely@redhat.com>
+ * include/std/future (packaged_task(allocator_arg_t, const A&, F&&):
+ Remove explicit (LWG 2407).
+
* include/bits/basic_string.h (basic_string::basic_string()): Make
noexcept conditional on allocator (LWG 2455).
diff --git a/libstdc++-v3/include/std/future b/libstdc++-v3/include/std/future
index a67db98..c4baf90 100644
--- a/libstdc++-v3/include/std/future
+++ b/libstdc++-v3/include/std/future
@@ -1489,9 +1489,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
// _GLIBCXX_RESOLVE_LIB_DEFECTS
// 2097. packaged_task constructors should be constrained
+ // 2407. [this constructor should not be] explicit
template<typename _Fn, typename _Alloc, typename = typename
__constrain_pkgdtask<packaged_task, _Fn>::__type>
- explicit
packaged_task(allocator_arg_t, const _Alloc& __a, _Fn&& __fn)
: _M_state(__create_task_state<_Res(_ArgTypes...)>(
std::forward<_Fn>(__fn), __a))