From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 6A6403858D35; Mon, 22 Nov 2021 14:57:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6A6403858D35 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-5450] libstdc++: Fix condition for definition of _GLIBCXX14_DEPRECATED X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: f58bf16f672cda3ac55f92f12e258c817ece6e3c X-Git-Newrev: d7376862b6dba35a192e3a80e9858d38f9709438 Message-Id: <20211122145723.6A6403858D35@sourceware.org> Date: Mon, 22 Nov 2021 14:57:23 +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: Mon, 22 Nov 2021 14:57:23 -0000 https://gcc.gnu.org/g:d7376862b6dba35a192e3a80e9858d38f9709438 commit r12-5450-gd7376862b6dba35a192e3a80e9858d38f9709438 Author: Jonathan Wakely Date: Fri Nov 19 20:58:31 2021 +0000 libstdc++: Fix condition for definition of _GLIBCXX14_DEPRECATED The check for C++14 was using the wrong date. libstdc++-v3/ChangeLog: * include/bits/c++config (_GLIBCXX14_DEPRECATED): Fix condition checking for C++14. Diff: --- libstdc++-v3/include/bits/c++config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/include/bits/c++config b/libstdc++-v3/include/bits/c++config index 4b7fa659300..cbcdedb366f 100644 --- a/libstdc++-v3/include/bits/c++config +++ b/libstdc++-v3/include/bits/c++config @@ -107,7 +107,7 @@ # define _GLIBCXX11_DEPRECATED_SUGGEST(ALT) #endif -#if defined(__DEPRECATED) && (__cplusplus >= 201403L) +#if defined(__DEPRECATED) && (__cplusplus >= 201402L) # define _GLIBCXX14_DEPRECATED _GLIBCXX_DEPRECATED # define _GLIBCXX14_DEPRECATED_SUGGEST(ALT) _GLIBCXX_DEPRECATED_SUGGEST(ALT) #else @@ -123,7 +123,7 @@ # define _GLIBCXX17_DEPRECATED_SUGGEST(ALT) #endif -#if defined(__DEPRECATED) && (__cplusplus > 201703L) +#if defined(__DEPRECATED) && (__cplusplus >= 202002L) # define _GLIBCXX20_DEPRECATED(MSG) [[deprecated(MSG)]] # define _GLIBCXX20_DEPRECATED_SUGGEST(ALT) _GLIBCXX_DEPRECATED_SUGGEST(ALT) #else