diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2018-08-10 00:25:53 +0100 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2018-08-10 00:25:53 +0100 |
| commit | 1fc9d0b0e4657b29ff140fa03dca1711aa5a1198 (patch) | |
| tree | de7d6dd8a1e2e274f4feb0b9d819fd3f00b6f82e /libstdc++-v3/include/std/regex | |
| parent | 093f71dbec040e07161888cc30a923599f38ac95 (diff) | |
| download | gcc-1fc9d0b0e4657b29ff140fa03dca1711aa5a1198.zip gcc-1fc9d0b0e4657b29ff140fa03dca1711aa5a1198.tar.gz gcc-1fc9d0b0e4657b29ff140fa03dca1711aa5a1198.tar.bz2 | |
Define aliases for containers using polymorphic_allocator
These aliases are placed in the top-level header, e.g. <vector> not
<bits/stl_vector.h>. This ensures that they refer to whichever of
std::vector or __debug::vector or __profile::vector is in use when the
header is included.
* include/std/deque (std::pmr::deque): Declare alias.
* include/std/forward_list (std::pmr::forward_list): Likewise.
* include/std/list (std::pmr::list): Likewise.
* include/std/map (std::pmr::map, std::pmr::multimap): Likewise.
* include/std/regex (std::pmr::match_results, std::pmr::cmatch)
(std::pmr::smatch, std::pmr::wcmatch, std::pmr::wsmatch): Likewise.
* include/std/set (std::pmr::set, std::pmr::multiset): Likewise.
* include/std/string (std::pmr::basic_string, std::pmr::string)
(std::pmr::u16string, std::pmr::u32string, std::pmr::wstring):
Likewise.
* include/std/unordered_map (std::pmr::unordered_map)
(std::pmr::unordered_multimap): Likewise.
* include/std/unordered_set (std::pmr::unordered_set)
(std::pmr::unordered_multiset): Likewise.
* include/std/vector (std::pmr::vector): Likewise.
* testsuite/21_strings/basic_string/types/pmr_typedefs.cc: New test.
* testsuite/23_containers/deque/types/pmr_typedefs.cc: New test.
* testsuite/23_containers/forward_list/pmr_typedefs.cc: New test.
* testsuite/23_containers/list/pmr_typedefs.cc: New test.
* testsuite/23_containers/map/pmr_typedefs.cc: New test.
* testsuite/23_containers/multimap/pmr_typedefs.cc: New test.
* testsuite/23_containers/multiset/pmr_typedefs.cc: New test.
* testsuite/23_containers/set/pmr_typedefs.cc: New test.
* testsuite/23_containers/unordered_map/pmr_typedefs.cc: New test.
* testsuite/23_containers/unordered_multimap/pmr_typedefs.cc: New
test.
* testsuite/23_containers/unordered_multiset/pmr_typedefs.cc: New
test.
* testsuite/23_containers/unordered_set/pmr_typedefs.cc: New test.
* testsuite/23_containers/vector/pmr_typedefs.cc: New test.
* testsuite/28_regex/match_results/pmr_typedefs.cc: New test.
From-SVN: r263456
Diffstat (limited to 'libstdc++-v3/include/std/regex')
| -rw-r--r-- | libstdc++-v3/include/std/regex | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/libstdc++-v3/include/std/regex b/libstdc++-v3/include/std/regex index 7e4564a..f0dfa3f 100644 --- a/libstdc++-v3/include/std/regex +++ b/libstdc++-v3/include/std/regex @@ -62,6 +62,27 @@ #include <bits/regex.h> #include <bits/regex_executor.h> +#if __cplusplus >= 201703L +#include <memory_resource> +namespace std _GLIBCXX_VISIBILITY(default) +{ +_GLIBCXX_BEGIN_NAMESPACE_VERSION + 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>; +#ifdef _GLIBCXX_USE_WCHAR_T + using wcmatch = match_results<const wchar_t*>; + using wsmatch = match_results<wstring::const_iterator>; +#endif + } // namespace pmr +_GLIBCXX_END_NAMESPACE_VERSION +} // namespace std +#endif // C++17 #endif // C++11 #endif // _GLIBCXX_REGEX |