From: redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 15 Dec 2015 17:06:25 +0000 (+0000)
Subject: Restore accidentally-removed volatile qualifier
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f41d1b1c2dd9c6234eebd6a287f12d3ef2d086d;p=thirdparty%2Fgcc.git

Restore accidentally-removed volatile qualifier

	* include/std/functional (_Mu<_Arg, false, false>::operator()): Restore
	accidentally-removed volatile qualifier.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@231660 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 507c02fcaa95..298b9dd3833c 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,8 @@
 2015-12-15  Jonathan Wakely  <jwakely@redhat.com>
 
+	* 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 99af29efeb15..ff29a57d850f 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<typename _CVArg, typename _Tuple>
 	_CVArg&&
-	operator()(_CVArg&& __arg, _Tuple&) const
+	operator()(_CVArg&& __arg, _Tuple&) const volatile
 	{ return std::forward<_CVArg>(__arg); }
     };