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-6283] libstdc++: Adjust friend declarations to work with Clang
Date: Thu,  6 Jan 2022 14:58:05 +0000 (GMT)	[thread overview]
Message-ID: <20220106145805.CBCEB3858027@sourceware.org> (raw)

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

commit r12-6283-gec12ddd1e7f7d6b48a593df865e7846039e7d62e
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Thu Jan 6 11:11:52 2022 +0000

    libstdc++: Adjust friend declarations to work with Clang
    
    I think this code is valid but it fails with Clang, possibly due to
    https://llvm.org/PR38882
    
    Qualifying the names makes it work for all compilers.
    
    libstdc++-v3/ChangeLog:
    
            * include/bits/regex.h (basic_regex, match_results): Qualify
            name in friend declaration, to work around Clang bug.

Diff:
---
 libstdc++-v3/include/bits/regex.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libstdc++-v3/include/bits/regex.h b/libstdc++-v3/include/bits/regex.h
index 7480b0a5f97..46c168010bf 100644
--- a/libstdc++-v3/include/bits/regex.h
+++ b/libstdc++-v3/include/bits/regex.h
@@ -796,7 +796,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11
 	__detail::__regex_algo_impl(_Bp, _Bp, match_results<_Bp, _Ap>&,
 				    const basic_regex<_Cp, _Rp>&,
 				    regex_constants::match_flag_type,
-				    _RegexExecutorPolicy, bool);
+				    __detail::_RegexExecutorPolicy, bool);
 
       template<typename, typename, typename, bool>
 	friend class __detail::_Executor;
@@ -2067,7 +2067,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11
 	__detail::__regex_algo_impl(_Bp, _Bp, match_results<_Bp, _Ap>&,
 				    const basic_regex<_Cp, _Rp>&,
 				    regex_constants::match_flag_type,
-				    _RegexExecutorPolicy, bool);
+				    __detail::_RegexExecutorPolicy, bool);
 
       // Reset contents to __size unmatched sub_match objects
       // (plus additional objects for prefix, suffix and unmatched sub).


                 reply	other threads:[~2022-01-06 14:58 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=20220106145805.CBCEB3858027@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).