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 507c02fcaa95d6ecf54cded047709541f4483182..298b9dd3833c9564ba82de3467d6ea3c7dc46a82 100644 (file)
--- 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 99af29efeb15e92e8cc705623962ee67db5b63fd..ff29a57d850f114541bdd6975c503cbd0f148b44 100644 (file)
--- 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); }
     };