Skip to content

Cleanups 8: Deprecate <strstream> classes instead of the entire header #2680

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 1, 2022
Merged

Cleanups 8: Deprecate <strstream> classes instead of the entire header #2680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion stl/inc/__msvc_all_public_headers.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
#endif // TRANSITION, OS-17090155 (UCRT)

#define _SILENCE_CXX17_C_HEADER_DEPRECATION_WARNING
#define _SILENCE_CXX17_STRSTREAM_DEPRECATION_WARNING
#define _SILENCE_EXPERIMENTAL_FILESYSTEM_DEPRECATION_WARNING
#define _SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS

Expand Down
18 changes: 10 additions & 8 deletions stl/inc/strstream
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,9 @@ _STL_DISABLE_CLANG_WARNINGS
#undef new

_STD_BEGIN

_CXX17_DEPRECATE_STRSTREAM typedef int _Header_strstream;
using _Hdr_strstream = _Header_strstream;

class strstreambuf : public streambuf { // stream buffer associated with static or allocated character array
_STL_DISABLE_DEPRECATED_WARNING
class _CXX17_DEPRECATE_STRSTREAM strstreambuf : public streambuf {
// stream buffer associated with static or allocated character array
public:
using _Mysb = streambuf;
enum { // constants for bits in stream state
Expand Down Expand Up @@ -423,7 +421,8 @@ inline void swap(strstreambuf& _Left, strstreambuf& _Right) {
_Left.swap(_Right);
}

class istrstream : public istream { // input stream associated with a character array
class _CXX17_DEPRECATE_STRSTREAM istrstream : public istream {
// input stream associated with a character array
public:
using _Mybase = istream;
using _Mysb = strstreambuf;
Expand Down Expand Up @@ -486,7 +485,8 @@ inline void swap(istrstream& _Left, istrstream& _Right) {
_Left.swap(_Right);
}

class ostrstream : public ostream { // output stream associated with a character array
class _CXX17_DEPRECATE_STRSTREAM ostrstream : public ostream {
// output stream associated with a character array
public:
using _Mybase = ostream;
using _Mysb = strstreambuf;
Expand Down Expand Up @@ -548,7 +548,8 @@ inline void swap(ostrstream& _Left, ostrstream& _Right) {
_Left.swap(_Right);
}

class strstream : public iostream { // input/output stream associated with character array buffer
class _CXX17_DEPRECATE_STRSTREAM strstream : public iostream {
// input/output stream associated with character array buffer
public:
using _Mybase = iostream;
using _Mysb = strstreambuf;
Expand Down Expand Up @@ -614,6 +615,7 @@ private:
inline void swap(strstream& _Left, strstream& _Right) {
_Left.swap(_Right);
}
_STL_RESTORE_DEPRECATED_WARNING
_STD_END
#pragma pop_macro("new")
_STL_RESTORE_CLANG_WARNINGS
Expand Down
1 change: 0 additions & 1 deletion tests/std/tests/VSO_0000000_instantiate_iterators_misc/test.compile.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
#define _SILENCE_CXX17_NEGATORS_DEPRECATION_WARNING
#define _SILENCE_CXX17_OLD_ALLOCATOR_MEMBERS_DEPRECATION_WARNING
#define _SILENCE_CXX17_RAW_STORAGE_ITERATOR_DEPRECATION_WARNING
#define _SILENCE_CXX17_STRSTREAM_DEPRECATION_WARNING
#define _SILENCE_CXX17_TEMPORARY_BUFFER_DEPRECATION_WARNING
#define _SILENCE_CXX20_ATOMIC_INIT_DEPRECATION_WARNING
#define _SILENCE_CXX20_CODECVT_FACETS_DEPRECATION_WARNING
Expand Down
2 changes: 1 addition & 1 deletion tests/std/tests/include_each_header_alone_matrix.lst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ PM_CL="/DMEOW_HEADER=stop_token"
PM_CL="/DMEOW_HEADER=streambuf"
PM_CL="/DMEOW_HEADER=string"
PM_CL="/DMEOW_HEADER=string_view"
PM_CL="/DMEOW_HEADER=strstream /D_SILENCE_CXX17_STRSTREAM_DEPRECATION_WARNING"
PM_CL="/DMEOW_HEADER=strstream"
PM_CL="/DMEOW_HEADER=syncstream"
PM_CL="/DMEOW_HEADER=system_error"
PM_CL="/DMEOW_HEADER=thread"
Expand Down