@@ -330,14 +330,6 @@ typedef basic_stringstream<wchar_t> wstringstream;
330330_LIBCPP_PUSH_MACROS
331331#include < __undef_macros>
332332
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-
341333_LIBCPP_BEGIN_NAMESPACE_STD
342334
343335// Class template basic_stringbuf [stringbuf]
@@ -460,9 +452,9 @@ public:
460452#if _LIBCPP_STD_VER <= 17 || defined(_LIBCPP_BUILDING_LIBRARY)
461453 string_type str () const ;
462454#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 ()); }
464456
465- _LIBCPP_HIDE_FROM_ABI_SSTREAM string_type str () && {
457+ _LIBCPP_HIDE_FROM_ABI string_type str () && {
466458 const basic_string_view<_CharT, _Traits> __view = view ();
467459 typename string_type::size_type __pos = __view.empty () ? 0 : __view.data () - __str_.data ();
468460 // In C++23, this is just string_type(std::move(__str_), __pos, __view.size(), __str_.get_allocator());
@@ -948,9 +940,9 @@ public:
948940#if _LIBCPP_STD_VER <= 17 || defined(_LIBCPP_BUILDING_LIBRARY)
949941 _LIBCPP_HIDE_FROM_ABI string_type str () const { return __sb_.str (); }
950942#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 (); }
952944
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 (); }
954946#endif
955947
956948#if _LIBCPP_STD_VER >= 20
@@ -1085,9 +1077,9 @@ public:
10851077#if _LIBCPP_STD_VER <= 17 || defined(_LIBCPP_BUILDING_LIBRARY)
10861078 _LIBCPP_HIDE_FROM_ABI string_type str () const { return __sb_.str (); }
10871079#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 (); }
10891081
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 (); }
10911083#endif
10921084
10931085#if _LIBCPP_STD_VER >= 20
@@ -1225,9 +1217,9 @@ public:
12251217#if _LIBCPP_STD_VER <= 17 || defined(_LIBCPP_BUILDING_LIBRARY)
12261218 _LIBCPP_HIDE_FROM_ABI string_type str () const { return __sb_.str (); }
12271219#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 (); }
12291221
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 (); }
12311223#endif
12321224
12331225#if _LIBCPP_STD_VER >= 20
0 commit comments