Skip to content

Commit fb635be

Browse files
H-G-HristovZingam
H-G-Hristov
and
Zingam
authored
[libc++] P2867R1: Remove Deprecated strstreams From C++26 (#87107)
Implements: https://wg21.link/P2867R2 --------- Co-authored-by: Hristo Hristov <[email protected]>
1 parent a4c4705 commit fb635be

Some content is hidden

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

49 files changed

+66
-46
lines changed

‎libcxx/docs/ReleaseNotes/19.rst‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ Implemented Papers
4242
- P2652R2 - Disallow User Specialization of ``allocator_traits``
4343
- P2819R2 - Add ``tuple`` protocol to ``complex``
4444
- P2495R3 - Interfacing ``stringstream``\s with ``string_view``
45+
- P2867R2 - Remove Deprecated ``strstream``\s From C++26
4546
- P2302R4 - ``std::ranges::contains``
4647
- P1659R3 - ``std::ranges::starts_with`` and ``std::ranges::ends_with``
4748

@@ -54,6 +55,8 @@ Improvements and New Features
5455
- The ``std::mismatch`` algorithm has been optimized for integral types, which can lead up to 40x performance
5556
improvements.
5657

58+
- The ``_LIBCPP_ENABLE_CXX26_REMOVED_STRSTREAM`` macro has been added to make the declarations in ``<strstream>`` available.
59+
5760
Deprecations and Removals
5861
-------------------------
5962

‎libcxx/docs/Status/Cxx2cPapers.csv‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"`P1673R13 <https://wg21.link/P1673R13>`__","LWG","A free function linear algebra interface based on the BLAS","Kona November 2023","","",""
4848
"","","","","","",""
4949
"`P2875R4 <https://wg21.link/P2875R4>`__","LWG","Undeprecate ``polymorphic_allocator::destroy`` for C++26","Tokyo March 2024","|Complete|","15.0",""
50-
"`P2867R2 <https://wg21.link/P2867R2>`__","LWG","Remove Deprecated ``strstreams`` From C++26","Tokyo March 2024","","",""
50+
"`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","","",""
5252
"`P2872R3 <https://wg21.link/P2872R3>`__","LWG","Remove ``wstring_convert`` From C++26","Tokyo March 2024","","",""
5353
"`P3107R5 <https://wg21.link/P3107R5>`__","LWG","Permit an efficient implementation of ``std::print``","Tokyo March 2024","","","|format| |DR|"

‎libcxx/docs/UsingLibcxx.rst‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,10 @@ C++26 Specific Configuration Macros
272272
``std::basic_string<...>::reserve()``.
273273

274274
**_LIBCPP_ENABLE_CXX26_REMOVED_ALLOCATOR_MEMBERS**:
275-
This macro is used to re-enable redundant member of ``allocator<T>::is_always_equal``
275+
This macro is used to re-enable redundant member of ``allocator<T>::is_always_equal``.
276+
277+
**_LIBCPP_ENABLE_CXX26_REMOVED_STRSTREAM**:
278+
This macro is used to re-enable all named declarations in ``<strstream>``.
276279

277280
Libc++ Extensions
278281
=================

‎libcxx/include/strstream‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
/*
1414
strstream synopsis
1515
16-
class strstreambuf
16+
class strstreambuf // Removed in C++26
1717
: public basic_streambuf<char>
1818
{
1919
public:
@@ -63,7 +63,7 @@ private:
6363
void (*pfree)(void*); // exposition only
6464
};
6565
66-
class istrstream
66+
class istrstream // Removed in C++26
6767
: public basic_istream<char>
6868
{
6969
public:
@@ -81,7 +81,7 @@ private:
8181
strstreambuf sb; // exposition only
8282
};
8383
84-
class ostrstream
84+
class ostrstream // Removed in C++26
8585
: public basic_ostream<char>
8686
{
8787
public:
@@ -99,7 +99,7 @@ private:
9999
strstreambuf sb; // exposition only
100100
};
101101
102-
class strstream
102+
class strstream // Removed in C++26
103103
: public basic_iostream<char>
104104
{
105105
public:
@@ -138,6 +138,8 @@ private:
138138
# pragma GCC system_header
139139
#endif
140140

141+
#if _LIBCPP_STD_VER < 26 || defined(_LIBCPP_ENABLE_CXX26_REMOVED_STRSTREAM) || defined(_LIBCPP_BUILDING_LIBRARY)
142+
141143
_LIBCPP_PUSH_MACROS
142144
#include <__undef_macros>
143145

@@ -344,4 +346,6 @@ _LIBCPP_END_NAMESPACE_STD
344346

345347
_LIBCPP_POP_MACROS
346348

349+
#endif // _LIBCPP_STD_VER < 26 || defined(_LIBCPP_ENABLE_CXX26_REMOVED_STRSTREAM) || defined(_LIBCPP_BUILDING_LIBRARY)
350+
347351
#endif // _LIBCPP_STRSTREAM

‎libcxx/modules/std/strstream.inc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@
99

1010
export namespace std {
1111
#ifndef _LIBCPP_HAS_NO_LOCALIZATION
12+
# if _LIBCPP_STD_VER < 26 || defined(_LIBCPP_ENABLE_CXX26_REMOVED_STRSTREAM)
1213
using std::istrstream;
1314
using std::ostrstream;
1415
using std::strstream;
1516
using std::strstreambuf;
17+
# endif // _LIBCPP_STD_VER < 26 || defined(_LIBCPP_ENABLE_CXX26_REMOVED_STRSTREAM)
1618
#endif // _LIBCPP_HAS_NO_LOCALIZATION
1719
} // namespace std

‎libcxx/test/std/depr/depr.str.strstreams/depr.istrstream/depr.istrstream.cons/ccp.pass.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9-
// ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DISABLE_DEPRECATION_WARNINGS
9+
// ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DISABLE_DEPRECATION_WARNINGS -D_LIBCPP_ENABLE_CXX26_REMOVED_STRSTREAM
1010

1111
// <strstream>
1212

‎libcxx/test/std/depr/depr.str.strstreams/depr.istrstream/depr.istrstream.cons/ccp_size.pass.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9-
// ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DISABLE_DEPRECATION_WARNINGS
9+
// ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DISABLE_DEPRECATION_WARNINGS -D_LIBCPP_ENABLE_CXX26_REMOVED_STRSTREAM
1010

1111
// <strstream>
1212

‎libcxx/test/std/depr/depr.str.strstreams/depr.istrstream/depr.istrstream.cons/cp.pass.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9-
// ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DISABLE_DEPRECATION_WARNINGS
9+
// ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DISABLE_DEPRECATION_WARNINGS -D_LIBCPP_ENABLE_CXX26_REMOVED_STRSTREAM
1010

1111
// <strstream>
1212

‎libcxx/test/std/depr/depr.str.strstreams/depr.istrstream/depr.istrstream.cons/cp_size.pass.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9-
// ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DISABLE_DEPRECATION_WARNINGS
9+
// ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DISABLE_DEPRECATION_WARNINGS -D_LIBCPP_ENABLE_CXX26_REMOVED_STRSTREAM
1010

1111
// <strstream>
1212

‎libcxx/test/std/depr/depr.str.strstreams/depr.istrstream/depr.istrstream.members/rdbuf.pass.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9-
// ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DISABLE_DEPRECATION_WARNINGS
9+
// ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DISABLE_DEPRECATION_WARNINGS -D_LIBCPP_ENABLE_CXX26_REMOVED_STRSTREAM
1010

1111
// <strstream>
1212

0 commit comments

Comments
 (0)