From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 70114 invoked by alias); 26 Sep 2016 10:19:05 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 70087 invoked by uid 89); 26 Sep 2016 10:19:04 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-4.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD,SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=U*redi, Hx-languages-length:1239, mistakenly X-Spam-User: qpsmtpd, 2 recipients X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 26 Sep 2016 10:19:02 +0000 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 41C034DD55; Mon, 26 Sep 2016 10:19:01 +0000 (UTC) Received: from localhost (ovpn-116-23.ams2.redhat.com [10.36.116.23]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u8QAJ0p5021268; Mon, 26 Sep 2016 06:19:00 -0400 Date: Mon, 26 Sep 2016 10:35:00 -0000 From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [PATCH] Remove redefinition of __cpp_lib_array_constexpr Message-ID: <20160926101900.GA14479@redhat.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="zYM0uCDKw75PZbzx" Content-Disposition: inline X-Clacks-Overhead: GNU Terry Pratchett User-Agent: Mutt/1.7.0 (2016-08-17) X-SW-Source: 2016-09/txt/msg01800.txt.bz2 --zYM0uCDKw75PZbzx Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline Content-length: 294 I mistakenly defined this macro before I committed the feature, and then we ended up with two (slightly different) definitions. * include/bits/range_access.h (__cpp_lib_array_constexpr): Do not redefine macro defined in . Tested powerpc64le-linux, committed to trunk. --zYM0uCDKw75PZbzx Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch.txt" Content-length: 938 commit 2ee4111bd25d1685a2e092256c85776c52b6f628 Author: redi Date: Mon Sep 26 10:17:53 2016 +0000 Remove redefinition of __cpp_lib_array_constexpr * include/bits/range_access.h (__cpp_lib_array_constexpr): Do not redefine macro defined in . git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@240488 138bc75d-0d04-0410-961f-82ee72b054a4 diff --git a/libstdc++-v3/include/bits/range_access.h b/libstdc++-v3/include/bits/range_access.h index 27cc8ed..95c3d52 100644 --- a/libstdc++-v3/include/bits/range_access.h +++ b/libstdc++-v3/include/bits/range_access.h @@ -38,10 +38,6 @@ namespace std _GLIBCXX_VISIBILITY(default) { _GLIBCXX_BEGIN_NAMESPACE_VERSION -#if __cplusplus >= 201402L -# define __cpp_lib_array_constexpr 201603L -#endif - /** * @brief Return an iterator pointing to the first element of * the container. --zYM0uCDKw75PZbzx--