From 1fc9d0b0e4657b29ff140fa03dca1711aa5a1198 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 10 Aug 2018 00:25:53 +0100 Subject: [PATCH] Define aliases for containers using polymorphic_allocator These aliases are placed in the top-level header, e.g. not . 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 --- libstdc++-v3/ChangeLog | 34 ++++++++++++ libstdc++-v3/include/std/deque | 14 +++++ libstdc++-v3/include/std/forward_list | 13 +++++ libstdc++-v3/include/std/list | 14 ++++- libstdc++-v3/include/std/map | 20 +++++++ libstdc++-v3/include/std/regex | 21 ++++++++ libstdc++-v3/include/std/set | 16 ++++++ libstdc++-v3/include/std/string | 20 +++++++ libstdc++-v3/include/std/unordered_map | 21 ++++++++ libstdc++-v3/include/std/unordered_set | 22 ++++++++ libstdc++-v3/include/std/vector | 14 ++++- .../basic_string/types/pmr_typedefs.cc | 52 +++++++++++++++++++ .../23_containers/deque/types/pmr_typedefs.cc | 27 ++++++++++ .../forward_list/pmr_typedefs.cc | 27 ++++++++++ .../23_containers/list/pmr_typedefs.cc | 27 ++++++++++ .../23_containers/map/pmr_typedefs.cc | 33 ++++++++++++ .../23_containers/multimap/pmr_typedefs.cc | 33 ++++++++++++ .../23_containers/multiset/pmr_typedefs.cc | 30 +++++++++++ .../23_containers/set/pmr_typedefs.cc | 30 +++++++++++ .../unordered_map/pmr_typedefs.cc | 37 +++++++++++++ .../unordered_multimap/pmr_typedefs.cc | 37 +++++++++++++ .../unordered_multiset/pmr_typedefs.cc | 36 +++++++++++++ .../unordered_set/pmr_typedefs.cc | 36 +++++++++++++ .../23_containers/vector/pmr_typedefs.cc | 27 ++++++++++ .../28_regex/match_results/pmr_typedefs.cc | 44 ++++++++++++++++ 25 files changed, 683 insertions(+), 2 deletions(-) create mode 100644 libstdc++-v3/testsuite/21_strings/basic_string/types/pmr_typedefs.cc create mode 100644 libstdc++-v3/testsuite/23_containers/deque/types/pmr_typedefs.cc create mode 100644 libstdc++-v3/testsuite/23_containers/forward_list/pmr_typedefs.cc create mode 100644 libstdc++-v3/testsuite/23_containers/list/pmr_typedefs.cc create mode 100644 libstdc++-v3/testsuite/23_containers/map/pmr_typedefs.cc create mode 100644 libstdc++-v3/testsuite/23_containers/multimap/pmr_typedefs.cc create mode 100644 libstdc++-v3/testsuite/23_containers/multiset/pmr_typedefs.cc create mode 100644 libstdc++-v3/testsuite/23_containers/set/pmr_typedefs.cc create mode 100644 libstdc++-v3/testsuite/23_containers/unordered_map/pmr_typedefs.cc create mode 100644 libstdc++-v3/testsuite/23_containers/unordered_multimap/pmr_typedefs.cc create mode 100644 libstdc++-v3/testsuite/23_containers/unordered_multiset/pmr_typedefs.cc create mode 100644 libstdc++-v3/testsuite/23_containers/unordered_set/pmr_typedefs.cc create mode 100644 libstdc++-v3/testsuite/23_containers/vector/pmr_typedefs.cc create mode 100644 libstdc++-v3/testsuite/28_regex/match_results/pmr_typedefs.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 20e03a1fdf5..1b61ec79360 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,37 @@ +2018-08-10 Jonathan Wakely + + * 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. + 2018-08-08 François Dumont * include/bits/stl_algo.h diff --git a/libstdc++-v3/include/std/deque b/libstdc++-v3/include/std/deque index 896ec8aade0..d2c75f1f078 100644 --- a/libstdc++-v3/include/std/deque +++ b/libstdc++-v3/include/std/deque @@ -73,4 +73,18 @@ # include #endif +#if __cplusplus >= 201703L +namespace std _GLIBCXX_VISIBILITY(default) +{ +_GLIBCXX_BEGIN_NAMESPACE_VERSION + namespace pmr + { + template class polymorphic_allocator; + template + using deque = std::deque<_Tp, polymorphic_allocator<_Tp>>; + } // namespace pmr +_GLIBCXX_END_NAMESPACE_VERSION +} // namespace std +#endif // C++17 + #endif /* _GLIBCXX_DEQUE */ diff --git a/libstdc++-v3/include/std/forward_list b/libstdc++-v3/include/std/forward_list index fd4cfe53179..00b41354c7d 100644 --- a/libstdc++-v3/include/std/forward_list +++ b/libstdc++-v3/include/std/forward_list @@ -47,6 +47,19 @@ # include #endif +#if __cplusplus >= 201703L +namespace std _GLIBCXX_VISIBILITY(default) +{ +_GLIBCXX_BEGIN_NAMESPACE_VERSION + namespace pmr + { + template class polymorphic_allocator; + template + using forward_list = std::forward_list<_Tp, polymorphic_allocator<_Tp>>; + } // namespace pmr +_GLIBCXX_END_NAMESPACE_VERSION +} // namespace std +#endif // C++17 #endif // C++11 #endif // _GLIBCXX_FORWARD_LIST diff --git a/libstdc++-v3/include/std/list b/libstdc++-v3/include/std/list index 6ba1363b84d..555371ffb76 100644 --- a/libstdc++-v3/include/std/list +++ b/libstdc++-v3/include/std/list @@ -71,5 +71,17 @@ # include #endif +#if __cplusplus >= 201703L +namespace std _GLIBCXX_VISIBILITY(default) +{ +_GLIBCXX_BEGIN_NAMESPACE_VERSION + namespace pmr + { + template class polymorphic_allocator; + template + using list = std::list<_Tp, polymorphic_allocator<_Tp>>; + } // namespace pmr +_GLIBCXX_END_NAMESPACE_VERSION +} // namespace std +#endif // C++17 #endif /* _GLIBCXX_LIST */ - diff --git a/libstdc++-v3/include/std/map b/libstdc++-v3/include/std/map index 5c429f00c0b..84f8cdb701d 100644 --- a/libstdc++-v3/include/std/map +++ b/libstdc++-v3/include/std/map @@ -70,4 +70,24 @@ # include #endif +#if __cplusplus >= 201703L +namespace std _GLIBCXX_VISIBILITY(default) +{ +_GLIBCXX_BEGIN_NAMESPACE_VERSION + namespace pmr + { + template class polymorphic_allocator; + template> + using map + = std::map<_Key, _Tp, _Cmp, + polymorphic_allocator>>; + template> + using multimap + = std::multimap<_Key, _Tp, _Cmp, + polymorphic_allocator>>; + } // namespace pmr +_GLIBCXX_END_NAMESPACE_VERSION +} // namespace std +#endif // C++17 + #endif /* _GLIBCXX_MAP */ diff --git a/libstdc++-v3/include/std/regex b/libstdc++-v3/include/std/regex index 7e4564a3783..f0dfa3f68ab 100644 --- a/libstdc++-v3/include/std/regex +++ b/libstdc++-v3/include/std/regex @@ -62,6 +62,27 @@ #include #include +#if __cplusplus >= 201703L +#include +namespace std _GLIBCXX_VISIBILITY(default) +{ +_GLIBCXX_BEGIN_NAMESPACE_VERSION + namespace pmr { + template class polymorphic_allocator; + template + using match_results + = std::match_results<_BidirectionalIterator, polymorphic_allocator< + sub_match<_BidirectionalIterator>>>; + using cmatch = match_results; + using smatch = match_results; +#ifdef _GLIBCXX_USE_WCHAR_T + using wcmatch = match_results; + using wsmatch = match_results; +#endif + } // namespace pmr +_GLIBCXX_END_NAMESPACE_VERSION +} // namespace std +#endif // C++17 #endif // C++11 #endif // _GLIBCXX_REGEX diff --git a/libstdc++-v3/include/std/set b/libstdc++-v3/include/std/set index 732c6d33f08..dd41b2f1911 100644 --- a/libstdc++-v3/include/std/set +++ b/libstdc++-v3/include/std/set @@ -70,4 +70,20 @@ # include #endif +#if __cplusplus >= 201703L +namespace std _GLIBCXX_VISIBILITY(default) +{ +_GLIBCXX_BEGIN_NAMESPACE_VERSION + namespace pmr + { + template class polymorphic_allocator; + template> + using set = std::set<_Key, _Cmp, polymorphic_allocator<_Key>>; + template> + using multiset = std::multiset<_Key, _Cmp, polymorphic_allocator<_Key>>; + } // namespace pmr +_GLIBCXX_END_NAMESPACE_VERSION +} // namespace std +#endif // C++17 + #endif /* _GLIBCXX_SET */ diff --git a/libstdc++-v3/include/std/string b/libstdc++-v3/include/std/string index 2fceead30a8..d3cc03aa179 100644 --- a/libstdc++-v3/include/std/string +++ b/libstdc++-v3/include/std/string @@ -52,4 +52,24 @@ #include #include +#if __cplusplus >= 201703L +namespace std _GLIBCXX_VISIBILITY(default) +{ +_GLIBCXX_BEGIN_NAMESPACE_VERSION + namespace pmr { + template class polymorphic_allocator; + template> + using basic_string = std::basic_string<_CharT, _Traits, + polymorphic_allocator<_CharT>>; + using string = basic_string; + using u16string = basic_string; + using u32string = basic_string; +#ifdef _GLIBCXX_USE_WCHAR_T + using wstring = basic_string; +#endif + } // namespace pmr +_GLIBCXX_END_NAMESPACE_VERSION +} // namespace std +#endif // C++17 + #endif /* _GLIBCXX_STRING */ diff --git a/libstdc++-v3/include/std/unordered_map b/libstdc++-v3/include/std/unordered_map index 85840fc49cd..fc1b1e3c71c 100644 --- a/libstdc++-v3/include/std/unordered_map +++ b/libstdc++-v3/include/std/unordered_map @@ -55,6 +55,27 @@ # include #endif +#if __cplusplus >= 201703L +namespace std _GLIBCXX_VISIBILITY(default) +{ +_GLIBCXX_BEGIN_NAMESPACE_VERSION + namespace pmr + { + template class polymorphic_allocator; + template, + typename _Pred = std::equal_to<_Key>> + using unordered_map + = std::unordered_map<_Key, _Tp, _Hash, _Pred, + polymorphic_allocator>>; + template, + typename _Pred = std::equal_to<_Key>> + using unordered_multimap + = std::unordered_multimap<_Key, _Tp, _Hash, _Pred, + polymorphic_allocator>>; + } // namespace pmr +_GLIBCXX_END_NAMESPACE_VERSION +} // namespace std +#endif // C++17 #endif // C++11 #endif // _GLIBCXX_UNORDERED_MAP diff --git a/libstdc++-v3/include/std/unordered_set b/libstdc++-v3/include/std/unordered_set index 0593fbd1b61..8c04669a46e 100644 --- a/libstdc++-v3/include/std/unordered_set +++ b/libstdc++-v3/include/std/unordered_set @@ -54,6 +54,28 @@ #ifdef _GLIBCXX_PROFILE # include #endif + +#if __cplusplus >= 201703L +namespace std _GLIBCXX_VISIBILITY(default) +{ +_GLIBCXX_BEGIN_NAMESPACE_VERSION + namespace pmr + { + template class polymorphic_allocator; + template, + typename _Pred = std::equal_to<_Key>> + using unordered_set + = std::unordered_set<_Key, _Hash, _Pred, + polymorphic_allocator<_Key>>; + template, + typename _Pred = std::equal_to<_Key>> + using unordered_multiset + = std::unordered_multiset<_Key, _Hash, _Pred, + polymorphic_allocator<_Key>>; + } // namespace pmr +_GLIBCXX_END_NAMESPACE_VERSION +} // namespace std +#endif // C++17 #endif // C++11 #endif // _GLIBCXX_UNORDERED_SET diff --git a/libstdc++-v3/include/std/vector b/libstdc++-v3/include/std/vector index e03e50f9c9a..2a421c631f1 100644 --- a/libstdc++-v3/include/std/vector +++ b/libstdc++-v3/include/std/vector @@ -77,5 +77,17 @@ # include #endif -#endif /* _GLIBCXX_VECTOR */ +#if __cplusplus >= 201703L +namespace std _GLIBCXX_VISIBILITY(default) +{ +_GLIBCXX_BEGIN_NAMESPACE_VERSION + namespace pmr { + template class polymorphic_allocator; + template + using vector = std::vector<_Tp, polymorphic_allocator<_Tp>>; + } // namespace pmr +_GLIBCXX_END_NAMESPACE_VERSION +} // namespace std +#endif // C++17 +#endif /* _GLIBCXX_VECTOR */ diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/types/pmr_typedefs.cc b/libstdc++-v3/testsuite/21_strings/basic_string/types/pmr_typedefs.cc new file mode 100644 index 00000000000..d20fc42901e --- /dev/null +++ b/libstdc++-v3/testsuite/21_strings/basic_string/types/pmr_typedefs.cc @@ -0,0 +1,52 @@ +// Copyright (C) 2018 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// { dg-options "-std=gnu++17" } +// { dg-do compile { target c++17 } } + +#include +#include + +struct T : std::char_traits { }; + +static_assert(std::is_same_v, + std::basic_string, + std::pmr::polymorphic_allocator>>); +static_assert(std::is_same_v, + std::basic_string>>); + +static_assert(std::is_same_v, + std::pmr::polymorphic_allocator>>); +static_assert(std::is_same_v, + std::pmr::polymorphic_allocator>>); +static_assert(std::is_same_v, + std::pmr::polymorphic_allocator>>); + +#ifdef _GLIBCXX_USE_WCHAR_T +static_assert(std::is_same_v, + std::basic_string, + std::pmr::polymorphic_allocator>>); +static_assert(std::is_same_v, + std::basic_string>>); + +static_assert(std::is_same_v, + std::pmr::polymorphic_allocator>>); +#endif diff --git a/libstdc++-v3/testsuite/23_containers/deque/types/pmr_typedefs.cc b/libstdc++-v3/testsuite/23_containers/deque/types/pmr_typedefs.cc new file mode 100644 index 00000000000..cd51626d35b --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/deque/types/pmr_typedefs.cc @@ -0,0 +1,27 @@ +// Copyright (C) 2018 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// { dg-options "-std=gnu++17" } +// { dg-do compile { target c++17 } } + +#include +#include + +struct X { }; + +static_assert(std::is_same_v, + std::deque>>); diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/pmr_typedefs.cc b/libstdc++-v3/testsuite/23_containers/forward_list/pmr_typedefs.cc new file mode 100644 index 00000000000..7bf61fac5f1 --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/forward_list/pmr_typedefs.cc @@ -0,0 +1,27 @@ +// Copyright (C) 2018 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// { dg-options "-std=gnu++17" } +// { dg-do compile { target c++17 } } + +#include +#include + +struct X { }; + +static_assert(std::is_same_v, + std::forward_list>>); diff --git a/libstdc++-v3/testsuite/23_containers/list/pmr_typedefs.cc b/libstdc++-v3/testsuite/23_containers/list/pmr_typedefs.cc new file mode 100644 index 00000000000..3359295ea33 --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/list/pmr_typedefs.cc @@ -0,0 +1,27 @@ +// Copyright (C) 2018 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// { dg-options "-std=gnu++17" } +// { dg-do compile { target c++17 } } + +#include +#include + +struct X { }; + +static_assert(std::is_same_v, + std::list>>); diff --git a/libstdc++-v3/testsuite/23_containers/map/pmr_typedefs.cc b/libstdc++-v3/testsuite/23_containers/map/pmr_typedefs.cc new file mode 100644 index 00000000000..1a49272b30c --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/map/pmr_typedefs.cc @@ -0,0 +1,33 @@ +// Copyright (C) 2018 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// { dg-options "-std=gnu++17" } +// { dg-do compile { target c++17 } } + +#include +#include + +struct X { }; +struct Y { }; +struct Cmp { bool operator()(X, X) const { return false; } }; + +static_assert(std::is_same_v, + std::map, + std::pmr::polymorphic_allocator>>>); +static_assert(std::is_same_v, + std::map>>>); diff --git a/libstdc++-v3/testsuite/23_containers/multimap/pmr_typedefs.cc b/libstdc++-v3/testsuite/23_containers/multimap/pmr_typedefs.cc new file mode 100644 index 00000000000..f1dc01e3393 --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/multimap/pmr_typedefs.cc @@ -0,0 +1,33 @@ +// Copyright (C) 2018 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// { dg-options "-std=gnu++17" } +// { dg-do compile { target c++17 } } + +#include +#include + +struct X { }; +struct Y { }; +struct Cmp { bool operator()(X, X) const { return false; } }; + +static_assert(std::is_same_v, + std::multimap, + std::pmr::polymorphic_allocator>>>); +static_assert(std::is_same_v, + std::multimap>>>); diff --git a/libstdc++-v3/testsuite/23_containers/multiset/pmr_typedefs.cc b/libstdc++-v3/testsuite/23_containers/multiset/pmr_typedefs.cc new file mode 100644 index 00000000000..224d8821a27 --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/multiset/pmr_typedefs.cc @@ -0,0 +1,30 @@ +// Copyright (C) 2018 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// { dg-options "-std=gnu++17" } +// { dg-do compile { target c++17 } } + +#include +#include + +struct X { }; +struct Cmp { bool operator()(X, X) const { return false; } }; + +static_assert(std::is_same_v, + std::multiset, std::pmr::polymorphic_allocator>>); +static_assert(std::is_same_v, + std::multiset>>); diff --git a/libstdc++-v3/testsuite/23_containers/set/pmr_typedefs.cc b/libstdc++-v3/testsuite/23_containers/set/pmr_typedefs.cc new file mode 100644 index 00000000000..f041c853118 --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/set/pmr_typedefs.cc @@ -0,0 +1,30 @@ +// Copyright (C) 2018 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// { dg-options "-std=gnu++17" } +// { dg-do compile { target c++17 } } + +#include +#include + +struct X { }; +struct Cmp { bool operator()(X, X) const { return false; } }; + +static_assert(std::is_same_v, + std::set, std::pmr::polymorphic_allocator>>); +static_assert(std::is_same_v, + std::set>>); diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/pmr_typedefs.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/pmr_typedefs.cc new file mode 100644 index 00000000000..c628539663e --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/unordered_map/pmr_typedefs.cc @@ -0,0 +1,37 @@ +// Copyright (C) 2018 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// { dg-options "-std=gnu++17" } +// { dg-do compile { target c++17 } } + +#include +#include + +struct X { }; +struct Y { }; +struct Hash { std::size_t operator()(X) const { return 0; } }; +struct Eq { bool operator()(X, X) const { return true; } }; + +static_assert(std::is_same_v, + std::unordered_map, std::equal_to, + std::pmr::polymorphic_allocator>>>); +static_assert(std::is_same_v, + std::unordered_map, + std::pmr::polymorphic_allocator>>>); +static_assert(std::is_same_v, + std::unordered_map>>>); diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/pmr_typedefs.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/pmr_typedefs.cc new file mode 100644 index 00000000000..849b5ab71e7 --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/pmr_typedefs.cc @@ -0,0 +1,37 @@ +// Copyright (C) 2018 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// { dg-options "-std=gnu++17" } +// { dg-do compile { target c++17 } } + +#include +#include + +struct X { }; +struct Y { }; +struct Hash { std::size_t operator()(X) const { return 0; } }; +struct Eq { bool operator()(X, X) const { return true; } }; + +static_assert(std::is_same_v, + std::unordered_multimap, std::equal_to, + std::pmr::polymorphic_allocator>>>); +static_assert(std::is_same_v, + std::unordered_multimap, + std::pmr::polymorphic_allocator>>>); +static_assert(std::is_same_v, + std::unordered_multimap>>>); diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/pmr_typedefs.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/pmr_typedefs.cc new file mode 100644 index 00000000000..c4eaaf5c7b7 --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/pmr_typedefs.cc @@ -0,0 +1,36 @@ +// Copyright (C) 2018 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// { dg-options "-std=gnu++17" } +// { dg-do compile { target c++17 } } + +#include +#include + +struct X { }; +struct Hash { std::size_t operator()(X) const { return 0; } }; +struct Eq { bool operator()(X, X) const { return true; } }; + +static_assert(std::is_same_v, + std::unordered_multiset, std::equal_to, + std::pmr::polymorphic_allocator>>); +static_assert(std::is_same_v, + std::unordered_multiset, + std::pmr::polymorphic_allocator>>); +static_assert(std::is_same_v, + std::unordered_multiset>>); diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/pmr_typedefs.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/pmr_typedefs.cc new file mode 100644 index 00000000000..ecd38235657 --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/unordered_set/pmr_typedefs.cc @@ -0,0 +1,36 @@ +// Copyright (C) 2018 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// { dg-options "-std=gnu++17" } +// { dg-do compile { target c++17 } } + +#include +#include + +struct X { }; +struct Hash { std::size_t operator()(X) const { return 0; } }; +struct Eq { bool operator()(X, X) const { return true; } }; + +static_assert(std::is_same_v, + std::unordered_set, std::equal_to, + std::pmr::polymorphic_allocator>>); +static_assert(std::is_same_v, + std::unordered_set, + std::pmr::polymorphic_allocator>>); +static_assert(std::is_same_v, + std::unordered_set>>); diff --git a/libstdc++-v3/testsuite/23_containers/vector/pmr_typedefs.cc b/libstdc++-v3/testsuite/23_containers/vector/pmr_typedefs.cc new file mode 100644 index 00000000000..d2f60febe8d --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/vector/pmr_typedefs.cc @@ -0,0 +1,27 @@ +// Copyright (C) 2018 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// { dg-options "-std=gnu++17" } +// { dg-do compile { target c++17 } } + +#include +#include + +struct X { }; + +static_assert(std::is_same_v, + std::vector>>); diff --git a/libstdc++-v3/testsuite/28_regex/match_results/pmr_typedefs.cc b/libstdc++-v3/testsuite/28_regex/match_results/pmr_typedefs.cc new file mode 100644 index 00000000000..23aef39caf3 --- /dev/null +++ b/libstdc++-v3/testsuite/28_regex/match_results/pmr_typedefs.cc @@ -0,0 +1,44 @@ +// Copyright (C) 2018 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// { dg-options "-std=gnu++17" } +// { dg-do compile { target c++17 } } + +#include +#include + +struct X; +static_assert(std::is_same_v, + std::match_results>>>); + +static_assert(std::is_same_v>>>); +static_assert(std::is_same_v>>>); +#ifdef _GLIBCXX_USE_WCHAR_T +static_assert(std::is_same_v>>>); +static_assert(std::is_same_v>>>); +#endif -- 2.30.2