diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 3d20ad4e316..34bda015a1e 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,8 @@ 2015-05-13 Jonathan Wakely + * 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 a67db98853f..c4baf90622a 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::__type> - explicit packaged_task(allocator_arg_t, const _Alloc& __a, _Fn&& __fn) : _M_state(__create_task_state<_Res(_ArgTypes...)>( std::forward<_Fn>(__fn), __a))