public inbox for gcc-patches@gcc.gnu.org
 help / color / mirror / Atom feed
From: Jonathan Wakely <jwakely@redhat.com>
To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org
Subject: [PATCH] Remove redefinition of __cpp_lib_array_constexpr
Date: Mon, 26 Sep 2016 10:35:00 -0000	[thread overview]
Message-ID: <20160926101900.GA14479@redhat.com> (raw)

[-- Attachment #1: Type: text/plain, Size: 294 bytes --]

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 <bits/stl_iterator.h>.

Tested powerpc64le-linux, committed to trunk.


[-- Attachment #2: patch.txt --]
[-- Type: text/plain, Size: 938 bytes --]

commit 2ee4111bd25d1685a2e092256c85776c52b6f628
Author: redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>
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 <bits/stl_iterator.h>.
    
    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.

                 reply	other threads:[~2016-09-26 10:19 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160926101900.GA14479@redhat.com \
    --to=jwakely@redhat.com \
    --cc=gcc-patches@gcc.gnu.org \
    --cc=libstdc++@gcc.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).