From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 3DC543857C52; Tue, 18 Jan 2022 16:32:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3DC543857C52 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r12-6690] libstdc++: Fix suggested alternative to std::ptr_fun X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: 0e4e4b37d9944430d0553c283a41e9a29482ccee X-Git-Newrev: 50bc6e463b5f0696bc3cb9edd743d09b17309370 Message-Id: <20220118163208.3DC543857C52@sourceware.org> Date: Tue, 18 Jan 2022 16:32:08 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Jan 2022 16:32:08 -0000 https://gcc.gnu.org/g:50bc6e463b5f0696bc3cb9edd743d09b17309370 commit r12-6690-g50bc6e463b5f0696bc3cb9edd743d09b17309370 Author: Jonathan Wakely Date: Tue Jan 18 11:43:21 2022 +0000 libstdc++: Fix suggested alternative to std::ptr_fun libstdc++-v3/ChangeLog: * include/bits/stl_function.h (ptr_fun): Fix suggestion for non-deprecated alternative. Diff: --- libstdc++-v3/include/bits/stl_function.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/include/bits/stl_function.h b/libstdc++-v3/include/bits/stl_function.h index a1a770dc2de..25badd5988a 100644 --- a/libstdc++-v3/include/bits/stl_function.h +++ b/libstdc++-v3/include/bits/stl_function.h @@ -1121,7 +1121,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /// One of the @link pointer_adaptors adaptors for function pointers@endlink. template - _GLIBCXX11_DEPRECATED_SUGGEST("std::mem_fn") + _GLIBCXX11_DEPRECATED_SUGGEST("std::function") inline pointer_to_unary_function<_Arg, _Result> ptr_fun(_Result (*__x)(_Arg)) { return pointer_to_unary_function<_Arg, _Result>(__x); } @@ -1148,7 +1148,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /// One of the @link pointer_adaptors adaptors for function pointers@endlink. template - _GLIBCXX11_DEPRECATED_SUGGEST("std::mem_fn") + _GLIBCXX11_DEPRECATED_SUGGEST("std::function") inline pointer_to_binary_function<_Arg1, _Arg2, _Result> ptr_fun(_Result (*__x)(_Arg1, _Arg2)) { return pointer_to_binary_function<_Arg1, _Arg2, _Result>(__x); }