Skip to content

Commit 12bb291

Browse files
authored
[libc++] Remove experimental pmr headers now shipped in mainline (#73172)
Several experimental headers around std::pmr have been slated for removal for a while now. This patch actually performs the removal and cleanups from the code base.
1 parent 28a5e6b commit 12bb291

File tree

85 files changed

+15
-6005
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+15
-6005
lines changed

libcxx/docs/DesignDocs/ExperimentalFeatures.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -106,19 +106,19 @@ Most (but not all) of the features of the LFTS were accepted into C++17.
106106
+---------+-------------------------------------------------------+--------------------+------------------------------------------+-------------------------+
107107
| 8.2.2 | ``weak_ptr`` enhancements | Not yet | Never added | |
108108
+---------+-------------------------------------------------------+--------------------+------------------------------------------+-------------------------+
109-
| 8.5 | ``memory_resource`` | Not yet | | |
109+
| 8.5 | ``memory_resource`` | 16.0 | 18.0 | Removed |
110110
+---------+-------------------------------------------------------+--------------------+------------------------------------------+-------------------------+
111-
| 8.6 | ``polymorphic_allocator`` | Not yet | | |
111+
| 8.6 | ``polymorphic_allocator`` | 16.0 | 18.0 | Removed |
112112
+---------+-------------------------------------------------------+--------------------+------------------------------------------+-------------------------+
113113
| 8.7 | ``resource_adaptor`` | | n/a | Not part of C++17 |
114114
+---------+-------------------------------------------------------+--------------------+------------------------------------------+-------------------------+
115-
| 8.8 | Access to program-wide ``memory_resource`` objects | Not yet | | |
115+
| 8.8 | Access to program-wide ``memory_resource`` objects | 16.0 | 18.0 | Removed |
116116
+---------+-------------------------------------------------------+--------------------+------------------------------------------+-------------------------+
117-
| 8.9 | Pool resource classes | Not yet | | |
117+
| 8.9 | Pool resource classes | 16.0 | 18.0 | Removed |
118118
+---------+-------------------------------------------------------+--------------------+------------------------------------------+-------------------------+
119-
| 8.10 | ``monotonic_buffer_resource`` | Not yet | | |
119+
| 8.10 | ``monotonic_buffer_resource`` | 16.0 | 18.0 | Removed |
120120
+---------+-------------------------------------------------------+--------------------+------------------------------------------+-------------------------+
121-
| 8.11 | Alias templates using polymorphic memory resources | Not yet | | |
121+
| 8.11 | Alias templates using polymorphic memory resources | 16.0 | 18.0 | Removed |
122122
+---------+-------------------------------------------------------+--------------------+------------------------------------------+-------------------------+
123123
| 8.12 | Non-owning pointers | | n/a | Not part of C++17 |
124124
+---------+-------------------------------------------------------+--------------------+------------------------------------------+-------------------------+

libcxx/docs/ReleaseNotes/18.rst

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -101,17 +101,14 @@ Deprecations and Removals
101101
Please see the updated documentation about the hardening modes in libc++ and in particular the
102102
``_LIBCPP_VERBOSE_ABORT`` macro for details.
103103

104-
Upcoming Deprecations and Removals
105-
----------------------------------
106-
107-
LLVM 18
108-
~~~~~~~
109-
110104
- The headers ``<experimental/deque>``, ``<experimental/forward_list>``, ``<experimental/list>``,
111105
``<experimental/map>``, ``<experimental/memory_resource>``, ``<experimental/regex>``, ``<experimental/set>``,
112106
``<experimental/string>``, ``<experimental/unordered_map>``, ``<experimental/unordered_set>``,
113-
and ``<experimental/vector>`` will be removed in LLVM 18, as all their contents will have been implemented in
114-
namespace ``std`` for at least two releases.
107+
and ``<experimental/vector>`` have been removed in LLVM 18, as all their contents will have been
108+
implemented in namespace ``std`` for at least two releases.
109+
110+
Upcoming Deprecations and Removals
111+
----------------------------------
115112

116113
LLVM 19
117114
~~~~~~~

libcxx/include/CMakeLists.txt

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -920,23 +920,12 @@ set(files
920920
experimental/__simd/traits.h
921921
experimental/__simd/utility.h
922922
experimental/__simd/vec_ext.h
923-
experimental/deque
924-
experimental/forward_list
925923
experimental/iterator
926-
experimental/list
927-
experimental/map
928924
experimental/memory
929-
experimental/memory_resource
930925
experimental/propagate_const
931-
experimental/regex
932-
experimental/set
933926
experimental/simd
934-
experimental/string
935927
experimental/type_traits
936-
experimental/unordered_map
937-
experimental/unordered_set
938928
experimental/utility
939-
experimental/vector
940929
ext/__hash
941930
ext/hash_map
942931
ext/hash_set

libcxx/include/__std_clang_module

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -86,25 +86,12 @@
8686
#include <exception>
8787
#include <execution>
8888
#include <expected>
89-
#include <experimental/deque>
90-
#include <experimental/forward_list>
9189
#include <experimental/iterator>
92-
#include <experimental/list>
93-
#include <experimental/map>
9490
#include <experimental/memory>
95-
#include <experimental/memory_resource>
9691
#include <experimental/propagate_const>
97-
#if !defined(_LIBCPP_HAS_NO_LOCALIZATION)
98-
# include <experimental/regex>
99-
#endif
100-
#include <experimental/set>
10192
#include <experimental/simd>
102-
#include <experimental/string>
10393
#include <experimental/type_traits>
104-
#include <experimental/unordered_map>
105-
#include <experimental/unordered_set>
10694
#include <experimental/utility>
107-
#include <experimental/vector>
10895
#include <fenv.h>
10996
#include <filesystem>
11097
#include <float.h>

libcxx/include/experimental/__config

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@
2828
#define _LIBCPP_END_NAMESPACE_LFTS_V2 } } }
2929
#define _VSTD_LFTS_V2 _VSTD_EXPERIMENTAL::fundamentals_v2
3030

31-
#define _LIBCPP_BEGIN_NAMESPACE_LFTS_PMR _LIBCPP_BEGIN_NAMESPACE_LFTS namespace pmr {
32-
#define _LIBCPP_END_NAMESPACE_LFTS_PMR _LIBCPP_END_NAMESPACE_LFTS }
33-
#define _VSTD_LFTS_PMR _VSTD_LFTS::pmr
34-
3531
// TODO: support more targets
3632
#if defined(__AVX__)
3733
#define _LIBCPP_NATIVE_SIMD_WIDTH_IN_BYTES 32

libcxx/include/experimental/deque

Lines changed: 0 additions & 52 deletions
This file was deleted.

libcxx/include/experimental/forward_list

Lines changed: 0 additions & 52 deletions
This file was deleted.

libcxx/include/experimental/list

Lines changed: 0 additions & 52 deletions
This file was deleted.

libcxx/include/experimental/map

Lines changed: 0 additions & 62 deletions
This file was deleted.

0 commit comments

Comments
 (0)