From 3a123c221518b30dc4e7f530739d62b0786259a1 Mon Sep 17 00:00:00 2001 From: Hristo Hristov Date: Sat, 12 Oct 2024 07:56:24 +0300 Subject: [PATCH] `spanstream` does not support `no-localization` --- libcxx/include/spanstream | 61 +++++++++++++++++++++------------------ 1 file changed, 33 insertions(+), 28 deletions(-) diff --git a/libcxx/include/spanstream b/libcxx/include/spanstream index d4d104e096e716..d4067106b49738 100644 --- a/libcxx/include/spanstream +++ b/libcxx/include/spanstream @@ -54,31 +54,34 @@ // clang-format on -#include <__concepts/convertible_to.h> #include <__config> -#include <__fwd/spanstream.h> -#include <__memory/addressof.h> -#include <__ranges/concepts.h> -#include <__utility/cmp.h> -#include <__utility/forward.h> -#include <__utility/move.h> -#include <__utility/swap.h> -#include -#include -#include -#include -#include - -#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) -# pragma GCC system_header -#endif + +#if !defined(_LIBCPP_HAS_NO_LOCALIZATION) + +# include <__concepts/convertible_to.h> +# include <__fwd/spanstream.h> +# include <__memory/addressof.h> +# include <__ranges/concepts.h> +# include <__utility/cmp.h> +# include <__utility/forward.h> +# include <__utility/move.h> +# include <__utility/swap.h> +# include +# include +# include +# include +# include + +# if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) +# pragma GCC system_header +# endif _LIBCPP_PUSH_MACROS -#include <__undef_macros> +# include <__undef_macros> _LIBCPP_BEGIN_NAMESPACE_STD -#if _LIBCPP_STD_VER >= 23 +# if _LIBCPP_STD_VER >= 23 // Class template basic_spanbuf [spanbuf] @@ -240,9 +243,9 @@ _LIBCPP_HIDE_FROM_ABI void swap(basic_spanbuf<_CharT, _Traits>& __x, basic_spanb } using std::spanbuf; -# ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS +# ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS using std::wspanbuf; -# endif +# endif // Class template basic_ispanstream [ispanstream] @@ -318,9 +321,9 @@ _LIBCPP_HIDE_FROM_ABI void swap(basic_ispanstream<_CharT, _Traits>& __x, basic_i } using std::ispanstream; -# ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS +# ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS using std::wispanstream; -# endif +# endif // Class template basic_ospanstream [ospanstream] @@ -381,9 +384,9 @@ _LIBCPP_HIDE_FROM_ABI void swap(basic_ospanstream<_CharT, _Traits>& __x, basic_o } using std::ospanstream; -# ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS +# ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS using std::wospanstream; -# endif +# endif template class _LIBCPP_TEMPLATE_VIS basic_spanstream : public basic_iostream<_CharT, _Traits> { @@ -442,16 +445,18 @@ _LIBCPP_HIDE_FROM_ABI void swap(basic_spanstream<_CharT, _Traits>& __x, basic_sp } using std::spanstream; -# ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS +# ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS using std::wspanstream; -# endif +# endif -#endif // _LIBCPP_STD_VER >= 23 +# endif // _LIBCPP_STD_VER >= 23 _LIBCPP_END_NAMESPACE_STD _LIBCPP_POP_MACROS +#endif // !_LIBCPP_HAS_NO_LOCALIZATION + #if _LIBCPP_STD_VER <= 20 && !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) # include #endif