diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2015-12-15 17:06:25 +0000 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2015-12-15 17:06:25 +0000 |
| commit | b110e777bd7dbccc5e73a7955263c4c969155a16 (patch) | |
| tree | 13ca51edc40859f7112f48d197aa76da269a2258 | |
| parent | bd5d4b6538af1d4c39cb8789d49051a5792af8d6 (diff) | |
| download | gcc-b110e777bd7dbccc5e73a7955263c4c969155a16.zip gcc-b110e777bd7dbccc5e73a7955263c4c969155a16.tar.gz gcc-b110e777bd7dbccc5e73a7955263c4c969155a16.tar.bz2 | |
Restore accidentally-removed volatile qualifier
* include/std/functional (_Mu<_Arg, false, false>::operator()): Restore
accidentally-removed volatile qualifier.
From-SVN: r231660
| -rw-r--r-- | libstdc++-v3/ChangeLog | 3 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/functional | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 507c02f..298b9dd 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 99af29e..ff29a57 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); } }; |