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.
This commit is contained in:
parent
e19e2989c3
commit
ec12ddd1e7
@ -796,7 +796,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11
|
|||||||
__detail::__regex_algo_impl(_Bp, _Bp, match_results<_Bp, _Ap>&,
|
__detail::__regex_algo_impl(_Bp, _Bp, match_results<_Bp, _Ap>&,
|
||||||
const basic_regex<_Cp, _Rp>&,
|
const basic_regex<_Cp, _Rp>&,
|
||||||
regex_constants::match_flag_type,
|
regex_constants::match_flag_type,
|
||||||
_RegexExecutorPolicy, bool);
|
__detail::_RegexExecutorPolicy, bool);
|
||||||
|
|
||||||
template<typename, typename, typename, bool>
|
template<typename, typename, typename, bool>
|
||||||
friend class __detail::_Executor;
|
friend class __detail::_Executor;
|
||||||
@ -2067,7 +2067,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11
|
|||||||
__detail::__regex_algo_impl(_Bp, _Bp, match_results<_Bp, _Ap>&,
|
__detail::__regex_algo_impl(_Bp, _Bp, match_results<_Bp, _Ap>&,
|
||||||
const basic_regex<_Cp, _Rp>&,
|
const basic_regex<_Cp, _Rp>&,
|
||||||
regex_constants::match_flag_type,
|
regex_constants::match_flag_type,
|
||||||
_RegexExecutorPolicy, bool);
|
__detail::_RegexExecutorPolicy, bool);
|
||||||
|
|
||||||
// Reset contents to __size unmatched sub_match objects
|
// Reset contents to __size unmatched sub_match objects
|
||||||
// (plus additional objects for prefix, suffix and unmatched sub).
|
// (plus additional objects for prefix, suffix and unmatched sub).
|
||||||
|
Loading…
x
Reference in New Issue
Block a user