From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id CBCEB3858027; Thu, 6 Jan 2022 14:58:05 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CBCEB3858027 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r12-6283] libstdc++: Adjust friend declarations to work with Clang X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: e19e2989c36c5148ceb67a1f2575718fc1927ce6 X-Git-Newrev: ec12ddd1e7f7d6b48a593df865e7846039e7d62e Message-Id: <20220106145805.CBCEB3858027@sourceware.org> Date: Thu, 6 Jan 2022 14:58:05 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Jan 2022 14:58:05 -0000 https://gcc.gnu.org/g:ec12ddd1e7f7d6b48a593df865e7846039e7d62e commit r12-6283-gec12ddd1e7f7d6b48a593df865e7846039e7d62e Author: Jonathan Wakely 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 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).