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 r10-9057] libstdc++: Remove <memory_resource> dependency from <regex> [PR 92546] Date: Fri, 20 Nov 2020 13:49:16 +0000 (GMT) [thread overview] Message-ID: <20201120134916.73C25388A423@sourceware.org> (raw) https://gcc.gnu.org/g:cbbc28706164873d0323d1a6c7988be3f4d971c9 commit r10-9057-gcbbc28706164873d0323d1a6c7988be3f4d971c9 Author: Jonathan Wakely <jwakely@redhat.com> Date: Fri Nov 20 11:30:33 2020 +0000 libstdc++: Remove <memory_resource> dependency from <regex> [PR 92546] Unlike the other headers that declare alias templates in namespace pmr, <regex> includes <memory_resource>. That was done because the pmr::string::const_iterator typedef requires pmr::string to be complete, which requires pmr::polymorphic_allocator<char> to be complete. By using __normal_iterator<const char*, pmr::string> instead of the const_iterator typedef we can avoid the completeness requirement. This makes <regex> smaller, by not requiring <memory_resource> and its <shared_mutex> dependency, which depends on <chrono>. Backporting this will also help with PR 97876, where <stop_token> ends up being needed by <regex> via <memory_resource>. libstdc++-v3/ChangeLog: PR libstdc++/92546 * include/std/regex (pmr::smatch, pmr::wsmatch): Declare using underlying __normal_iterator type, not nested typedef basic_string::const_iterator. (cherry picked from commit 640ebeb336050887cb57417b7568279c588088f0) Diff: --- libstdc++-v3/include/std/regex | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/libstdc++-v3/include/std/regex b/libstdc++-v3/include/std/regex index b4b8ea7daca..a64318a2a94 100644 --- a/libstdc++-v3/include/std/regex +++ b/libstdc++-v3/include/std/regex @@ -63,21 +63,25 @@ #include <bits/regex_executor.h> #if __cplusplus >= 201703L && _GLIBCXX_USE_CXX11_ABI -#include <memory_resource> namespace std _GLIBCXX_VISIBILITY(default) { _GLIBCXX_BEGIN_NAMESPACE_VERSION - namespace pmr { + namespace pmr + { template<typename _Tp> class polymorphic_allocator; template<typename _BidirectionalIterator> using match_results = std::match_results<_BidirectionalIterator, polymorphic_allocator< sub_match<_BidirectionalIterator>>>; - using cmatch = match_results<const char*>; - using smatch = match_results<string::const_iterator>; + using cmatch = match_results<const char*>; + // Use __normal_iterator directly, because pmr::string::const_iterator + // would require pmr::polymorphic_allocator to be complete. + using smatch + = match_results<__gnu_cxx::__normal_iterator<const char*, string>>; #ifdef _GLIBCXX_USE_WCHAR_T using wcmatch = match_results<const wchar_t*>; - using wsmatch = match_results<wstring::const_iterator>; + using wsmatch + = match_results<__gnu_cxx::__normal_iterator<const wchar_t*, wstring>>; #endif } // namespace pmr _GLIBCXX_END_NAMESPACE_VERSION
reply other threads:[~2020-11-20 13:49 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=20201120134916.73C25388A423@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: linkBe 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).