public inbox for libstdc++-cvs@sourceware.org
help / color / mirror / Atom feed
From: Jonathan Wakely <redi@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org
Subject: [gcc r12-1536] libstdc++: Use named struct for __decay_copy
Date: Wed, 16 Jun 2021 13:31:31 +0000 (GMT)	[thread overview]
Message-ID: <20210616133131.BCAEE383982A@sourceware.org> (raw)

https://gcc.gnu.org/g:c25e3bf87975280a603ff18fba387c6707ce4a95

commit r12-1536-gc25e3bf87975280a603ff18fba387c6707ce4a95
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Wed Jun 16 12:47:32 2021 +0100

    libstdc++: Use named struct for __decay_copy
    
    In r12-1486-gcb326a6442f09cb36b05ce556fc91e10bfeb0cf6 I changed
    __decay_copy to be a function object of unnamed class type. This causes
    problems when importing the library headers:
    
    error: conflicting global module declaration 'constexpr const std::ranges::__cust_access::<unnamed struct> std::ranges::__cust_access::__decay_copy'
    
    The fix is to use a named struct instead of an anonymous one.
    
    Signed-off-by: Jonathan Wakely <jwakely@redhat.com>
    
    libstdc++-v3/ChangeLog:
    
            * include/bits/iterator_concepts.h (__decay_copy): Name type.

Diff:
---
 libstdc++-v3/include/bits/iterator_concepts.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libstdc++-v3/include/bits/iterator_concepts.h b/libstdc++-v3/include/bits/iterator_concepts.h
index d18ae32bf20..11748e5ed7b 100644
--- a/libstdc++-v3/include/bits/iterator_concepts.h
+++ b/libstdc++-v3/include/bits/iterator_concepts.h
@@ -930,7 +930,8 @@ namespace ranges
   {
     using std::__detail::__class_or_enum;
 
-    struct {
+    struct _Decay_copy final
+    {
       template<typename _Tp>
 	constexpr decay_t<_Tp>
 	operator()(_Tp&& __t) const


                 reply	other threads:[~2021-06-16 13:31 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=20210616133131.BCAEE383982A@sourceware.org \
    --to=redi@gcc.gnu.org \
    --cc=gcc-cvs@gcc.gnu.org \
    --cc=libstdc++-cvs@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).