@@ -330,14 +330,6 @@ typedef basic_stringstream<wchar_t> wstringstream;
330
330
_LIBCPP_PUSH_MACROS
331
331
#include < __undef_macros>
332
332
333
- // TODO(LLVM-19): Remove this once we drop support for Clang 16,
334
- // which had this bug: https://github.com/llvm/llvm-project/issues/40363
335
- #ifdef _WIN32
336
- # define _LIBCPP_HIDE_FROM_ABI_SSTREAM _LIBCPP_ALWAYS_INLINE
337
- #else
338
- # define _LIBCPP_HIDE_FROM_ABI_SSTREAM _LIBCPP_HIDE_FROM_ABI
339
- #endif
340
-
341
333
_LIBCPP_BEGIN_NAMESPACE_STD
342
334
343
335
// Class template basic_stringbuf [stringbuf]
@@ -460,9 +452,9 @@ public:
460
452
#if _LIBCPP_STD_VER <= 17 || defined(_LIBCPP_BUILDING_LIBRARY)
461
453
string_type str () const ;
462
454
#else
463
- _LIBCPP_HIDE_FROM_ABI_SSTREAM string_type str () const & { return str (__str_.get_allocator ()); }
455
+ _LIBCPP_HIDE_FROM_ABI string_type str () const & { return str (__str_.get_allocator ()); }
464
456
465
- _LIBCPP_HIDE_FROM_ABI_SSTREAM string_type str () && {
457
+ _LIBCPP_HIDE_FROM_ABI string_type str () && {
466
458
const basic_string_view<_CharT, _Traits> __view = view ();
467
459
typename string_type::size_type __pos = __view.empty () ? 0 : __view.data () - __str_.data ();
468
460
// In C++23, this is just string_type(std::move(__str_), __pos, __view.size(), __str_.get_allocator());
@@ -948,9 +940,9 @@ public:
948
940
#if _LIBCPP_STD_VER <= 17 || defined(_LIBCPP_BUILDING_LIBRARY)
949
941
_LIBCPP_HIDE_FROM_ABI string_type str () const { return __sb_.str (); }
950
942
#else
951
- _LIBCPP_HIDE_FROM_ABI_SSTREAM string_type str () const & { return __sb_.str (); }
943
+ _LIBCPP_HIDE_FROM_ABI string_type str () const & { return __sb_.str (); }
952
944
953
- _LIBCPP_HIDE_FROM_ABI_SSTREAM string_type str () && { return std::move (__sb_).str (); }
945
+ _LIBCPP_HIDE_FROM_ABI string_type str () && { return std::move (__sb_).str (); }
954
946
#endif
955
947
956
948
#if _LIBCPP_STD_VER >= 20
@@ -1085,9 +1077,9 @@ public:
1085
1077
#if _LIBCPP_STD_VER <= 17 || defined(_LIBCPP_BUILDING_LIBRARY)
1086
1078
_LIBCPP_HIDE_FROM_ABI string_type str () const { return __sb_.str (); }
1087
1079
#else
1088
- _LIBCPP_HIDE_FROM_ABI_SSTREAM string_type str () const & { return __sb_.str (); }
1080
+ _LIBCPP_HIDE_FROM_ABI string_type str () const & { return __sb_.str (); }
1089
1081
1090
- _LIBCPP_HIDE_FROM_ABI_SSTREAM string_type str () && { return std::move (__sb_).str (); }
1082
+ _LIBCPP_HIDE_FROM_ABI string_type str () && { return std::move (__sb_).str (); }
1091
1083
#endif
1092
1084
1093
1085
#if _LIBCPP_STD_VER >= 20
@@ -1225,9 +1217,9 @@ public:
1225
1217
#if _LIBCPP_STD_VER <= 17 || defined(_LIBCPP_BUILDING_LIBRARY)
1226
1218
_LIBCPP_HIDE_FROM_ABI string_type str () const { return __sb_.str (); }
1227
1219
#else
1228
- _LIBCPP_HIDE_FROM_ABI_SSTREAM string_type str () const & { return __sb_.str (); }
1220
+ _LIBCPP_HIDE_FROM_ABI string_type str () const & { return __sb_.str (); }
1229
1221
1230
- _LIBCPP_HIDE_FROM_ABI_SSTREAM string_type str () && { return std::move (__sb_).str (); }
1222
+ _LIBCPP_HIDE_FROM_ABI string_type str () && { return std::move (__sb_).str (); }
1231
1223
#endif
1232
1224
1233
1225
#if _LIBCPP_STD_VER >= 20
0 commit comments