From b110e777bd7dbccc5e73a7955263c4c969155a16 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Tue, 15 Dec 2015 17:06:25 +0000 Subject: [PATCH] Restore accidentally-removed volatile qualifier * include/std/functional (_Mu<_Arg, false, false>::operator()): Restore accidentally-removed volatile qualifier. From-SVN: r231660 --- libstdc++-v3/ChangeLog | 3 +++ libstdc++-v3/include/std/functional | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 507c02fcaa9..298b9dd3833 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,8 @@ 2015-12-15 Jonathan Wakely + * include/std/functional (_Mu<_Arg, false, false>::operator()): Restore + accidentally-removed volatile qualifier. + * include/std/functional (is_placeholder, is_bind_expression): Update comments. (_Safe_tuple_element): Replace with _Safe_tuple_element_t alias diff --git a/libstdc++-v3/include/std/functional b/libstdc++-v3/include/std/functional index 99af29efeb1..ff29a57d850 100644 --- a/libstdc++-v3/include/std/functional +++ b/libstdc++-v3/include/std/functional @@ -852,7 +852,7 @@ _GLIBCXX_MEM_FN_TRAITS(&&, false_type, true_type) public: template _CVArg&& - operator()(_CVArg&& __arg, _Tuple&) const + operator()(_CVArg&& __arg, _Tuple&) const volatile { return std::forward<_CVArg>(__arg); } }; -- 2.30.2