diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2018-08-22 23:54:33 +0100 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2018-08-22 23:54:33 +0100 |
| commit | 1bc7a28f9424f4abe021f1831c8f07c0f8f62b3f (patch) | |
| tree | da495d90be79538037a589639cba305dcc02f0a0 /libstdc++-v3/include/std/regex | |
| parent | af55b3af33f0a35fecd2117a43ee93468925e98c (diff) | |
| download | gcc-1bc7a28f9424f4abe021f1831c8f07c0f8f62b3f.zip gcc-1bc7a28f9424f4abe021f1831c8f07c0f8f62b3f.tar.gz gcc-1bc7a28f9424f4abe021f1831c8f07c0f8f62b3f.tar.bz2 | |
PR libstdc++/87061 remove pmr type aliases for COW strings
The pmr aliases for basic_string and match_results are incompatible with
the gcc4-compatible ABI because the Copy-On-Write basic_string class
doesn't support C++11 allocators.
PR libstdc++/87061
* include/experimental/regex [!_GLIBCXX_USE_CXX11_ABI]
(experimental::pmr::match_results, experimental::pmr::cmatch)
(experimental::pmr::smatch, experimental::pmr::wcmatch)
(experimental::pmr::wsmatch): Do not declare for gcc4-compatible ABI,
because COW strings don't support C++11 allocator model.
* include/experimental/string [!_GLIBCXX_USE_CXX11_ABI]
(experimental::pmr::basic_string, experimental::pmr::string)
(experimental::pmr::u16string, experimental::pmr::u32string)
(experimental::pmr::wstring): Likewise.
* include/std/regex [!_GLIBCXX_USE_CXX11_ABI] (pmr::match_results)
(pmr::cmatch, pmr::smatch, pmr::wcmatch, pmr::wsmatch): Likewise.
* include/std/string [!_GLIBCXX_USE_CXX11_ABI] (pmr::basic_string)
(pmr::string, pmr::u16string, pmr::u32string, pmr::wstring): Likewise.
* testsuite/21_strings/basic_string/types/pmr_typedefs.cc: Require
cxx11-abi.
* testsuite/28_regex/match_results/pmr_typedefs.cc: Likewise.
From-SVN: r263791
Diffstat (limited to 'libstdc++-v3/include/std/regex')
| -rw-r--r-- | libstdc++-v3/include/std/regex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libstdc++-v3/include/std/regex b/libstdc++-v3/include/std/regex index f0dfa3f..fd15565 100644 --- a/libstdc++-v3/include/std/regex +++ b/libstdc++-v3/include/std/regex @@ -62,7 +62,7 @@ #include <bits/regex.h> #include <bits/regex_executor.h> -#if __cplusplus >= 201703L +#if __cplusplus >= 201703L && _GLIBCXX_USE_CXX11_ABI #include <memory_resource> namespace std _GLIBCXX_VISIBILITY(default) { |