Skip to content

Commit a834436

Browse files
H-G-HristovH-G-Hristov
authored
[libc++] P2872R3: Remove wstring_convert From C++26 (#87100)
Implements: https://wg21.link/P2872R3
1 parent 3c37f92 commit a834436

File tree

28 files changed

+46
-27
lines changed

28 files changed

+46
-27
lines changed

‎libcxx/docs/ReleaseNotes/19.rst‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ Implemented Papers
4343
- P2819R2 - Add ``tuple`` protocol to ``complex``
4444
- P2495R3 - Interfacing ``stringstream``\s with ``string_view``
4545
- P2867R2 - Remove Deprecated ``strstream``\s From C++26
46+
- P2872R3 - Remove ``wstring_convert`` From C++26
4647
- P2302R4 - ``std::ranges::contains``
4748
- P1659R3 - ``std::ranges::starts_with`` and ``std::ranges::ends_with``
4849

@@ -57,6 +58,9 @@ Improvements and New Features
5758

5859
- The ``_LIBCPP_ENABLE_CXX26_REMOVED_STRSTREAM`` macro has been added to make the declarations in ``<strstream>`` available.
5960

61+
- The ``_LIBCPP_ENABLE_CXX26_REMOVED_WSTRING_CONVERT`` macro has been added to make the declarations in ``<locale>``
62+
available.
63+
6064
Deprecations and Removals
6165
-------------------------
6266

‎libcxx/docs/Status/Cxx2cPapers.csv‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"`P2875R4 <https://wg21.link/P2875R4>`__","LWG","Undeprecate ``polymorphic_allocator::destroy`` for C++26","Tokyo March 2024","|Complete|","15.0",""
5050
"`P2867R2 <https://wg21.link/P2867R2>`__","LWG","Remove Deprecated ``strstreams`` From C++26","Tokyo March 2024","|Complete|","19.0",""
5151
"`P2869R4 <https://wg21.link/P2869R4>`__","LWG","Remove Deprecated ``shared_ptr`` Atomic Access APIs from C++26","Tokyo March 2024","","",""
52-
"`P2872R3 <https://wg21.link/P2872R3>`__","LWG","Remove ``wstring_convert`` From C++26","Tokyo March 2024","","",""
52+
"`P2872R3 <https://wg21.link/P2872R3>`__","LWG","Remove ``wstring_convert`` From C++26","Tokyo March 2024","|Complete|","19.0",""
5353
"`P3107R5 <https://wg21.link/P3107R5>`__","LWG","Permit an efficient implementation of ``std::print``","Tokyo March 2024","","","|format| |DR|"
5454
"`P3142R0 <https://wg21.link/P3142R0>`__","LWG","Printing Blank Lines with ``println``","Tokyo March 2024","","","|format|"
5555
"`P2845R8 <https://wg21.link/P2845R8>`__","LWG","Formatting of ``std::filesystem::path``","Tokyo March 2024","","","|format|"

‎libcxx/docs/UsingLibcxx.rst‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ C++17 Specific Configuration Macros
234234

235235
C++20 Specific Configuration Macros
236236
-----------------------------------
237-
**_LIBCPP_ENABLE_CXX20_REMOVED_SHARED_PTR_UNIQUE**
237+
**_LIBCPP_ENABLE_CXX20_REMOVED_SHARED_PTR_UNIQUE**:
238238
This macro is used to re-enable the function
239239
``std::shared_ptr<...>::unique()``.
240240

@@ -267,7 +267,7 @@ C++26 Specific Configuration Macros
267267
**_LIBCPP_ENABLE_CXX26_REMOVED_CODECVT**:
268268
This macro is used to re-enable all named declarations in ``<codecvt>``.
269269

270-
**_LIBCPP_ENABLE_CXX26_REMOVED_STRING_RESERVE**
270+
**_LIBCPP_ENABLE_CXX26_REMOVED_STRING_RESERVE**:
271271
This macro is used to re-enable the function
272272
``std::basic_string<...>::reserve()``.
273273

@@ -277,6 +277,10 @@ C++26 Specific Configuration Macros
277277
**_LIBCPP_ENABLE_CXX26_REMOVED_STRSTREAM**:
278278
This macro is used to re-enable all named declarations in ``<strstream>``.
279279

280+
**_LIBCPP_ENABLE_CXX26_REMOVED_WSTRING_CONVERT**:
281+
This macro is used to re-enable the ``wstring_convert`` and ``wbuffer_convert``
282+
in ``<locale>``.
283+
280284
Libc++ Extensions
281285
=================
282286

‎libcxx/include/locale‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ template <class charT> charT tolower(charT c, const locale& loc);
8484
template<class Codecvt, class Elem = wchar_t,
8585
class Wide_alloc = allocator<Elem>,
8686
class Byte_alloc = allocator<char>>
87-
class wstring_convert
87+
class wstring_convert // Removed in C++26
8888
{
8989
public:
9090
typedef basic_string<char, char_traits<char>, Byte_alloc> byte_string;
@@ -119,7 +119,7 @@ public:
119119
};
120120
121121
template <class Codecvt, class Elem = wchar_t, class Tr = char_traits<Elem>>
122-
class wbuffer_convert
122+
class wbuffer_convert // Removed in C++26
123123
: public basic_streambuf<Elem, Tr>
124124
{
125125
public:
@@ -3107,6 +3107,8 @@ extern template class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS messages_byname<char>;
31073107
extern template class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS messages_byname<wchar_t>;
31083108
#endif
31093109

3110+
#if _LIBCPP_STD_VER < 26 || defined(_LIBCPP_ENABLE_CXX26_REMOVED_WSTRING_CONVERT)
3111+
31103112
template <class _Codecvt,
31113113
class _Elem = wchar_t,
31123114
class _WideAlloc = allocator<_Elem>,
@@ -3712,6 +3714,8 @@ wbuffer_convert<_Codecvt, _Elem, _Tr>* wbuffer_convert<_Codecvt, _Elem, _Tr>::__
37123714

37133715
_LIBCPP_SUPPRESS_DEPRECATED_POP
37143716

3717+
#endif // _LIBCPP_STD_VER < 26 || defined(_LIBCPP_ENABLE_CXX26_REMOVED_WSTRING_CONVERT)
3718+
37153719
_LIBCPP_END_NAMESPACE_STD
37163720

37173721
_LIBCPP_POP_MACROS

‎libcxx/modules/std/locale.inc‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,15 @@ export namespace std {
6767
using std::messages_base;
6868
using std::messages_byname;
6969

70+
# if _LIBCPP_STD_VER < 26 || defined(_LIBCPP_ENABLE_CXX26_REMOVED_WSTRING_CONVERT)
71+
7072
// [depr.conversions.buffer]
7173
using std::wbuffer_convert;
7274

7375
// [depr.conversions.string]
7476
using std::wstring_convert;
77+
78+
# endif // _LIBCPP_STD_VER < 26 || defined(_LIBCPP_ENABLE_CXX26_REMOVED_WSTRING_CONVERT)
79+
7580
#endif // _LIBCPP_HAS_NO_LOCALIZATION
7681
} // namespace std

‎libcxx/test/libcxx/input.output/file.streams/fstreams/fstream.cons/wchar_pointer.pass.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
// UNSUPPORTED: no-wide-characters
1919

2020
// TODO: This should not be necessary
21-
// ADDITIONAL_COMPILE_FLAGS:-D_LIBCPP_ENABLE_CXX26_REMOVED_CODECVT
21+
// ADDITIONAL_COMPILE_FLAGS:-D_LIBCPP_ENABLE_CXX26_REMOVED_CODECVT -D_LIBCPP_ENABLE_CXX26_REMOVED_WSTRING_CONVERT
2222

2323
#include <fstream>
2424
#include <cassert>

‎libcxx/test/libcxx/input.output/file.streams/fstreams/fstream.members/open_wchar_pointer.pass.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
// UNSUPPORTED: no-wide-characters
1919

2020
// TODO: This should not be necessary
21-
// ADDITIONAL_COMPILE_FLAGS:-D_LIBCPP_ENABLE_CXX26_REMOVED_CODECVT
21+
// ADDITIONAL_COMPILE_FLAGS:-D_LIBCPP_ENABLE_CXX26_REMOVED_CODECVT -D_LIBCPP_ENABLE_CXX26_REMOVED_WSTRING_CONVERT
2222

2323
#include <fstream>
2424
#include <cassert>

‎libcxx/test/libcxx/input.output/file.streams/fstreams/ofstream.cons/wchar_pointer.pass.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
// UNSUPPORTED: no-wide-characters
1919

2020
// TODO: This should not be necessary
21-
// ADDITIONAL_COMPILE_FLAGS:-D_LIBCPP_ENABLE_CXX26_REMOVED_CODECVT
21+
// ADDITIONAL_COMPILE_FLAGS:-D_LIBCPP_ENABLE_CXX26_REMOVED_CODECVT -D_LIBCPP_ENABLE_CXX26_REMOVED_WSTRING_CONVERT
2222

2323
#include <fstream>
2424
#include <cassert>

‎libcxx/test/libcxx/input.output/file.streams/fstreams/ofstream.members/open_wchar_pointer.pass.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
// UNSUPPORTED: no-wide-characters
1919

2020
// TODO: This should not be necessary
21-
// ADDITIONAL_COMPILE_FLAGS:-D_LIBCPP_ENABLE_CXX26_REMOVED_CODECVT
21+
// ADDITIONAL_COMPILE_FLAGS:-D_LIBCPP_ENABLE_CXX26_REMOVED_CODECVT -D_LIBCPP_ENABLE_CXX26_REMOVED_WSTRING_CONVERT
2222

2323
#include <fstream>
2424
#include <cassert>

‎libcxx/test/libcxx/localization/locales/locale.convenience/conversions/conversions.string/ctor_move.pass.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
// UNSUPPORTED: c++03
1212

13-
// ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DISABLE_DEPRECATION_WARNINGS -D_LIBCPP_ENABLE_CXX26_REMOVED_CODECVT
13+
// ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DISABLE_DEPRECATION_WARNINGS -D_LIBCPP_ENABLE_CXX26_REMOVED_CODECVT -D_LIBCPP_ENABLE_CXX26_REMOVED_WSTRING_CONVERT
1414

1515
// <locale>
1616

0 commit comments

Comments
 (0)