From patchwork Mon Nov 22 14:57:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 47998 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 008373858436 for ; Mon, 22 Nov 2021 14:58:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 008373858436 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1637593120; bh=kLutgM/qiJnQArXeVgA6VDsnDu+P1eQKlysB+DZg3xs=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=vLVc7yxZ8kOk72F80sX30QAFIzDaFZt5BwQyOX35hnzZJ37eXXAsQFlLy8IvhWAJJ fDQYCxkbXp8urfnc4C9ZNoSrt+9+6XzerMbmgvoh+tpJXxjf1Xgqb0cWpjy+VsazH8 7yl7YDv+pRqQRhG/0lE/3eyj9pM3YL6Zv2GUNbYQ= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id BBBAD3858D35 for ; Mon, 22 Nov 2021 14:57:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org BBBAD3858D35 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-449-Ypy6mSxvOrSm4QF9qXpZYA-1; Mon, 22 Nov 2021 09:57:37 -0500 X-MC-Unique: Ypy6mSxvOrSm4QF9qXpZYA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 439ED1851721; Mon, 22 Nov 2021 14:57:36 +0000 (UTC) Received: from localhost (unknown [10.33.36.17]) by smtp.corp.redhat.com (Postfix) with ESMTP id DA2F679453; Mon, 22 Nov 2021 14:57:35 +0000 (UTC) To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Fix condition for definition of _GLIBCXX14_DEPRECATED Date: Mon, 22 Nov 2021 14:57:35 +0000 Message-Id: <20211122145735.780669-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-14.1 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=unavailable autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Jonathan Wakely via Gcc-patches From: Jonathan Wakely Reply-To: Jonathan Wakely Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Tested x86_64-linux, pushed to trunk. 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. --- 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