aboutsummaryrefslogtreecommitdiff
path: root/libcxx/modules
diff options
context:
space:
mode:
authorNikolas Klauser <nikolasklauser@berlin.de>2024-11-06 10:39:19 +0100
committerGitHub <noreply@github.com>2024-11-06 10:39:19 +0100
commitc6f3b7bcd0596d30f8dabecdfb9e44f9a07b6e4c (patch)
treedbfd623fea1771448ff564d5fc4221db7fca2f84 /libcxx/modules
parent5acc4a3dc0e2145d2bfef47f1543bb291c2b866a (diff)
downloadllvm-c6f3b7bcd0596d30f8dabecdfb9e44f9a07b6e4c.zip
llvm-c6f3b7bcd0596d30f8dabecdfb9e44f9a07b6e4c.tar.gz
llvm-c6f3b7bcd0596d30f8dabecdfb9e44f9a07b6e4c.tar.bz2
[libc++] Refactor the configuration macros to being always defined (#112094)
This is a follow-up to #89178. This updates the `<__config_site>` macros.
Diffstat (limited to 'libcxx/modules')
-rw-r--r--libcxx/modules/std.compat.cppm.in2
-rw-r--r--libcxx/modules/std.compat/clocale.inc4
-rw-r--r--libcxx/modules/std.compat/cstdlib.inc2
-rw-r--r--libcxx/modules/std.compat/cwchar.inc4
-rw-r--r--libcxx/modules/std.compat/cwctype.inc4
-rw-r--r--libcxx/modules/std.cppm.in28
-rw-r--r--libcxx/modules/std/atomic.inc2
-rw-r--r--libcxx/modules/std/barrier.inc4
-rw-r--r--libcxx/modules/std/chrono.inc20
-rw-r--r--libcxx/modules/std/clocale.inc4
-rw-r--r--libcxx/modules/std/codecvt.inc4
-rw-r--r--libcxx/modules/std/complex.inc4
-rw-r--r--libcxx/modules/std/condition_variable.inc4
-rw-r--r--libcxx/modules/std/cstdlib.inc2
-rw-r--r--libcxx/modules/std/cwchar.inc4
-rw-r--r--libcxx/modules/std/cwctype.inc4
-rw-r--r--libcxx/modules/std/filesystem.inc12
-rw-r--r--libcxx/modules/std/format.inc10
-rw-r--r--libcxx/modules/std/fstream.inc14
-rw-r--r--libcxx/modules/std/future.inc4
-rw-r--r--libcxx/modules/std/iomanip.inc4
-rw-r--r--libcxx/modules/std/ios.inc6
-rw-r--r--libcxx/modules/std/iosfwd.inc4
-rw-r--r--libcxx/modules/std/iostream.inc6
-rw-r--r--libcxx/modules/std/istream.inc8
-rw-r--r--libcxx/modules/std/latch.inc4
-rw-r--r--libcxx/modules/std/locale.inc4
-rw-r--r--libcxx/modules/std/memory.inc4
-rw-r--r--libcxx/modules/std/mutex.inc4
-rw-r--r--libcxx/modules/std/ostream.inc10
-rw-r--r--libcxx/modules/std/print.inc4
-rw-r--r--libcxx/modules/std/random.inc2
-rw-r--r--libcxx/modules/std/ranges.inc6
-rw-r--r--libcxx/modules/std/regex.inc16
-rw-r--r--libcxx/modules/std/semaphore.inc4
-rw-r--r--libcxx/modules/std/shared_mutex.inc4
-rw-r--r--libcxx/modules/std/spanstream.inc8
-rw-r--r--libcxx/modules/std/sstream.inc12
-rw-r--r--libcxx/modules/std/stop_token.inc4
-rw-r--r--libcxx/modules/std/streambuf.inc6
-rw-r--r--libcxx/modules/std/string.inc6
-rw-r--r--libcxx/modules/std/string_view.inc2
-rw-r--r--libcxx/modules/std/strstream.inc4
-rw-r--r--libcxx/modules/std/syncstream.inc8
-rw-r--r--libcxx/modules/std/thread.inc8
45 files changed, 140 insertions, 144 deletions
diff --git a/libcxx/modules/std.compat.cppm.in b/libcxx/modules/std.compat.cppm.in
index fbc2c7d..5cea1b7 100644
--- a/libcxx/modules/std.compat.cppm.in
+++ b/libcxx/modules/std.compat.cppm.in
@@ -24,7 +24,7 @@ module;
#include <cfloat>
#include <cinttypes>
#include <climits>
-#if !defined(_LIBCPP_HAS_NO_LOCALIZATION)
+#if _LIBCPP_HAS_LOCALIZATION
# include <clocale>
#endif
#include <cmath>
diff --git a/libcxx/modules/std.compat/clocale.inc b/libcxx/modules/std.compat/clocale.inc
index 1a975c5..bc1c0c4 100644
--- a/libcxx/modules/std.compat/clocale.inc
+++ b/libcxx/modules/std.compat/clocale.inc
@@ -8,10 +8,10 @@
//===----------------------------------------------------------------------===//
export {
-#ifndef _LIBCPP_HAS_NO_LOCALIZATION
+#if _LIBCPP_HAS_LOCALIZATION
using ::lconv _LIBCPP_USING_IF_EXISTS;
using ::localeconv _LIBCPP_USING_IF_EXISTS;
using ::setlocale _LIBCPP_USING_IF_EXISTS;
-#endif // _LIBCPP_HAS_NO_LOCALIZATION
+#endif // _LIBCPP_HAS_LOCALIZATION
} // export
diff --git a/libcxx/modules/std.compat/cstdlib.inc b/libcxx/modules/std.compat/cstdlib.inc
index 94f5e7e..84583d9 100644
--- a/libcxx/modules/std.compat/cstdlib.inc
+++ b/libcxx/modules/std.compat/cstdlib.inc
@@ -45,7 +45,7 @@ export {
// [c.mb.wcs], multibyte / wide string and character conversion functions
using ::mblen _LIBCPP_USING_IF_EXISTS;
-#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
+#if _LIBCPP_HAS_WIDE_CHARACTERS
using ::mbstowcs _LIBCPP_USING_IF_EXISTS;
using ::mbtowc _LIBCPP_USING_IF_EXISTS;
using ::wcstombs _LIBCPP_USING_IF_EXISTS;
diff --git a/libcxx/modules/std.compat/cwchar.inc b/libcxx/modules/std.compat/cwchar.inc
index 4cad928..38df156 100644
--- a/libcxx/modules/std.compat/cwchar.inc
+++ b/libcxx/modules/std.compat/cwchar.inc
@@ -8,7 +8,7 @@
//===----------------------------------------------------------------------===//
export {
-#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
+#if _LIBCPP_HAS_WIDE_CHARACTERS
using ::mbstate_t _LIBCPP_USING_IF_EXISTS;
using ::size_t _LIBCPP_USING_IF_EXISTS;
using ::wint_t _LIBCPP_USING_IF_EXISTS;
@@ -76,5 +76,5 @@ export {
using ::mbsrtowcs _LIBCPP_USING_IF_EXISTS;
using ::wcrtomb _LIBCPP_USING_IF_EXISTS;
using ::wcsrtombs _LIBCPP_USING_IF_EXISTS;
-#endif // _LIBCPP_HAS_NO_WIDE_CHARACTERS
+#endif // _LIBCPP_HAS_WIDE_CHARACTERS
} // export
diff --git a/libcxx/modules/std.compat/cwctype.inc b/libcxx/modules/std.compat/cwctype.inc
index 8d06eaa..d9c3c65 100644
--- a/libcxx/modules/std.compat/cwctype.inc
+++ b/libcxx/modules/std.compat/cwctype.inc
@@ -8,7 +8,7 @@
//===----------------------------------------------------------------------===//
export {
-#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
+#if _LIBCPP_HAS_WIDE_CHARACTERS
using ::wctrans_t _LIBCPP_USING_IF_EXISTS;
using ::wctype_t _LIBCPP_USING_IF_EXISTS;
using ::wint_t _LIBCPP_USING_IF_EXISTS;
@@ -31,5 +31,5 @@ export {
using ::towupper _LIBCPP_USING_IF_EXISTS;
using ::wctrans _LIBCPP_USING_IF_EXISTS;
using ::wctype _LIBCPP_USING_IF_EXISTS;
-#endif // _LIBCPP_HAS_NO_WIDE_CHARACTERS
+#endif // _LIBCPP_HAS_WIDE_CHARACTERS
} // export
diff --git a/libcxx/modules/std.cppm.in b/libcxx/modules/std.cppm.in
index b4889e5..b9d00df 100644
--- a/libcxx/modules/std.cppm.in
+++ b/libcxx/modules/std.cppm.in
@@ -35,11 +35,11 @@ module;
#include <chrono>
#include <cinttypes>
#include <climits>
-#if !defined(_LIBCPP_HAS_NO_LOCALIZATION)
+#if _LIBCPP_HAS_LOCALIZATION
# include <clocale>
#endif
#include <cmath>
-#if !defined(_LIBCPP_HAS_NO_LOCALIZATION)
+#if _LIBCPP_HAS_LOCALIZATION
# include <codecvt>
#endif
#include <compare>
@@ -67,30 +67,30 @@ module;
#include <flat_map>
#include <format>
#include <forward_list>
-#if !defined(_LIBCPP_HAS_NO_LOCALIZATION)
+#if _LIBCPP_HAS_LOCALIZATION
# include <fstream>
#endif
#include <functional>
#include <future>
#include <initializer_list>
-#if !defined(_LIBCPP_HAS_NO_LOCALIZATION)
+#if _LIBCPP_HAS_LOCALIZATION
# include <iomanip>
#endif
-#if !defined(_LIBCPP_HAS_NO_LOCALIZATION)
+#if _LIBCPP_HAS_LOCALIZATION
# include <ios>
#endif
#include <iosfwd>
-#if !defined(_LIBCPP_HAS_NO_LOCALIZATION)
+#if _LIBCPP_HAS_LOCALIZATION
# include <iostream>
#endif
-#if !defined(_LIBCPP_HAS_NO_LOCALIZATION)
+#if _LIBCPP_HAS_LOCALIZATION
# include <istream>
#endif
#include <iterator>
#include <latch>
#include <limits>
#include <list>
-#if !defined(_LIBCPP_HAS_NO_LOCALIZATION)
+#if _LIBCPP_HAS_LOCALIZATION
# include <locale>
#endif
#include <map>
@@ -102,7 +102,7 @@ module;
#include <numbers>
#include <numeric>
#include <optional>
-#if !defined(_LIBCPP_HAS_NO_LOCALIZATION)
+#if _LIBCPP_HAS_LOCALIZATION
# include <ostream>
#endif
#include <print>
@@ -110,7 +110,7 @@ module;
#include <random>
#include <ranges>
#include <ratio>
-#if !defined(_LIBCPP_HAS_NO_LOCALIZATION)
+#if _LIBCPP_HAS_LOCALIZATION
# include <regex>
#endif
#include <scoped_allocator>
@@ -119,21 +119,21 @@ module;
#include <shared_mutex>
#include <source_location>
#include <span>
-#if !defined(_LIBCPP_HAS_NO_LOCALIZATION)
+#if _LIBCPP_HAS_LOCALIZATION
# include <sstream>
#endif
#include <stack>
#include <stdexcept>
#include <stop_token>
-#if !defined(_LIBCPP_HAS_NO_LOCALIZATION)
+#if _LIBCPP_HAS_LOCALIZATION
# include <streambuf>
#endif
#include <string>
#include <string_view>
-#if !defined(_LIBCPP_HAS_NO_LOCALIZATION)
+#if _LIBCPP_HAS_LOCALIZATION
# include <strstream>
#endif
-#if !defined(_LIBCPP_HAS_NO_LOCALIZATION)
+#if _LIBCPP_HAS_LOCALIZATION
# include <syncstream>
#endif
#include <system_error>
diff --git a/libcxx/modules/std/atomic.inc b/libcxx/modules/std/atomic.inc
index 6ed0f7e..9a30fb7 100644
--- a/libcxx/modules/std/atomic.inc
+++ b/libcxx/modules/std/atomic.inc
@@ -73,7 +73,7 @@ export namespace std {
using std::atomic_ullong _LIBCPP_USING_IF_EXISTS;
using std::atomic_ulong _LIBCPP_USING_IF_EXISTS;
using std::atomic_ushort _LIBCPP_USING_IF_EXISTS;
-#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
+#if _LIBCPP_HAS_WIDE_CHARACTERS
using std::atomic_wchar_t _LIBCPP_USING_IF_EXISTS;
#endif
diff --git a/libcxx/modules/std/barrier.inc b/libcxx/modules/std/barrier.inc
index dadb67f..2d6a888 100644
--- a/libcxx/modules/std/barrier.inc
+++ b/libcxx/modules/std/barrier.inc
@@ -8,7 +8,7 @@
//===----------------------------------------------------------------------===//
export namespace std {
-#ifndef _LIBCPP_HAS_NO_THREADS
+#if _LIBCPP_HAS_THREADS
using std::barrier;
-#endif // _LIBCPP_HAS_NO_THREADS
+#endif
} // namespace std
diff --git a/libcxx/modules/std/chrono.inc b/libcxx/modules/std/chrono.inc
index 8d313f7..df21d1f 100644
--- a/libcxx/modules/std/chrono.inc
+++ b/libcxx/modules/std/chrono.inc
@@ -50,7 +50,7 @@ export namespace std {
using std::chrono::round;
// [time.duration.io], duration I/O
-#ifndef _LIBCPP_HAS_NO_LOCALIZATION
+#if _LIBCPP_HAS_LOCALIZATION
using std::chrono::operator<<;
#endif
// using std::chrono::from_stream;
@@ -111,7 +111,7 @@ export namespace std {
using std::chrono::file_time;
-#ifndef _LIBCPP_HAS_NO_MONOTONIC_CLOCK
+#if _LIBCPP_HAS_MONOTONIC_CLOCK
// [time.clock.steady], class steady_clock
using std::chrono::steady_clock;
#endif
@@ -191,8 +191,7 @@ export namespace std {
#ifdef _LIBCPP_ENABLE_EXPERIMENTAL
-# if !defined(_LIBCPP_HAS_NO_TIME_ZONE_DATABASE) && !defined(_LIBCPP_HAS_NO_FILESYSTEM) && \
- !defined(_LIBCPP_HAS_NO_LOCALIZATION)
+# if _LIBCPP_HAS_TIME_ZONE_DATABASE && _LIBCPP_HAS_FILESYSTEM && _LIBCPP_HAS_LOCALIZATION
// [time.zone.db], time zone database
using std::chrono::tzdb;
@@ -208,8 +207,7 @@ export namespace std {
using std::chrono::reload_tzdb;
using std::chrono::remote_version;
-# endif // !defined(_LIBCPP_HAS_NO_TIME_ZONE_DATABASE) && !defined(_LIBCPP_HAS_NO_FILESYSTEM) &&
- // !defined(_LIBCPP_HAS_NO_LOCALIZATION)
+# endif // _LIBCPP_HAS_TIME_ZONE_DATABASE && _LIBCPP_HAS_FILESYSTEM && _LIBCPP_HAS_LOCALIZATION
// [time.zone.exception], exception classes
using std::chrono::ambiguous_local_time;
@@ -219,8 +217,7 @@ export namespace std {
using std::chrono::local_info;
using std::chrono::sys_info;
-# if !defined(_LIBCPP_HAS_NO_TIME_ZONE_DATABASE) && !defined(_LIBCPP_HAS_NO_FILESYSTEM) && \
- !defined(_LIBCPP_HAS_NO_LOCALIZATION)
+# if _LIBCPP_HAS_TIME_ZONE_DATABASE && _LIBCPP_HAS_FILESYSTEM && _LIBCPP_HAS_LOCALIZATION
// [time.zone.timezone], class time_zone
using std::chrono::choose;
@@ -244,15 +241,14 @@ export namespace std {
// [time.format], formatting
using std::chrono::local_time_format;
# endif
-# endif // !defined(_LIBCPP_HAS_NO_TIME_ZONE_DATABASE) && !defined(_LIBCPP_HAS_NO_FILESYSTEM) &&
- // !defined(_LIBCPP_HAS_NO_LOCALIZATION)
+# endif // _LIBCPP_HAS_TIME_ZONE_DATABASE && _LIBCPP_HAS_FILESYSTEM && _LIBCPP_HAS_LOCALIZATION
#endif // _LIBCPP_ENABLE_EXPERIMENTAL
} // namespace chrono
-#ifndef _LIBCPP_HAS_NO_LOCALIZATION
+#if _LIBCPP_HAS_LOCALIZATION
using std::formatter;
-#endif // _LIBCPP_HAS_NO_LOCALIZATION
+#endif
namespace chrono {
// using std::chrono::parse;
diff --git a/libcxx/modules/std/clocale.inc b/libcxx/modules/std/clocale.inc
index 359868a..c336a97 100644
--- a/libcxx/modules/std/clocale.inc
+++ b/libcxx/modules/std/clocale.inc
@@ -8,10 +8,10 @@
//===----------------------------------------------------------------------===//
export namespace std {
-#ifndef _LIBCPP_HAS_NO_LOCALIZATION
+#if _LIBCPP_HAS_LOCALIZATION
using std::lconv _LIBCPP_USING_IF_EXISTS;
using std::localeconv _LIBCPP_USING_IF_EXISTS;
using std::setlocale _LIBCPP_USING_IF_EXISTS;
-#endif // _LIBCPP_HAS_NO_LOCALIZATION
+#endif // _LIBCPP_HAS_LOCALIZATION
} // namespace std
diff --git a/libcxx/modules/std/codecvt.inc b/libcxx/modules/std/codecvt.inc
index 277ef04..07accd5 100644
--- a/libcxx/modules/std/codecvt.inc
+++ b/libcxx/modules/std/codecvt.inc
@@ -8,7 +8,7 @@
//===----------------------------------------------------------------------===//
export namespace std {
-#ifndef _LIBCPP_HAS_NO_LOCALIZATION
+#if _LIBCPP_HAS_LOCALIZATION
# if _LIBCPP_STD_VER < 26 || defined(_LIBCPP_ENABLE_CXX26_REMOVED_CODECVT)
using std::codecvt_mode;
@@ -16,5 +16,5 @@ export namespace std {
using std::codecvt_utf8;
using std::codecvt_utf8_utf16;
# endif // _LIBCPP_STD_VER < 26 || defined(_LIBCPP_ENABLE_CXX26_REMOVED_CODECVT)
-#endif // _LIBCPP_HAS_NO_LOCALIZATION
+#endif // _LIBCPP_HAS_LOCALIZATION
} // namespace std
diff --git a/libcxx/modules/std/complex.inc b/libcxx/modules/std/complex.inc
index 47a4442..1ad5f78 100644
--- a/libcxx/modules/std/complex.inc
+++ b/libcxx/modules/std/complex.inc
@@ -19,10 +19,10 @@ export namespace std {
using std::operator/;
using std::operator==;
-#ifndef _LIBCPP_HAS_NO_LOCALIZATION
+#if _LIBCPP_HAS_LOCALIZATION
using std::operator>>;
using std::operator<<;
-#endif // _LIBCPP_HAS_NO_LOCALIZATION
+#endif // _LIBCPP_HAS_LOCALIZATION
// [complex.value.ops], values
using std::imag;
diff --git a/libcxx/modules/std/condition_variable.inc b/libcxx/modules/std/condition_variable.inc
index b428918..c3197d6 100644
--- a/libcxx/modules/std/condition_variable.inc
+++ b/libcxx/modules/std/condition_variable.inc
@@ -8,7 +8,7 @@
//===----------------------------------------------------------------------===//
export namespace std {
-#ifndef _LIBCPP_HAS_NO_THREADS
+#if _LIBCPP_HAS_THREADS
// [thread.condition.condvar], class condition_variable
using std::condition_variable;
// [thread.condition.condvarany], class condition_variable_any
@@ -18,5 +18,5 @@ export namespace std {
using std::notify_all_at_thread_exit;
using std::cv_status;
-#endif // _LIBCPP_HAS_NO_THREADS
+#endif // _LIBCPP_HAS_THREADS
} // namespace std
diff --git a/libcxx/modules/std/cstdlib.inc b/libcxx/modules/std/cstdlib.inc
index 617cf3f..bfa8876 100644
--- a/libcxx/modules/std/cstdlib.inc
+++ b/libcxx/modules/std/cstdlib.inc
@@ -45,7 +45,7 @@ export namespace std {
// [c.mb.wcs], multibyte / wide string and character conversion functions
using std::mblen _LIBCPP_USING_IF_EXISTS;
-#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
+#if _LIBCPP_HAS_WIDE_CHARACTERS
using std::mbstowcs _LIBCPP_USING_IF_EXISTS;
using std::mbtowc _LIBCPP_USING_IF_EXISTS;
using std::wcstombs _LIBCPP_USING_IF_EXISTS;
diff --git a/libcxx/modules/std/cwchar.inc b/libcxx/modules/std/cwchar.inc
index 02b1713..6fda1cf 100644
--- a/libcxx/modules/std/cwchar.inc
+++ b/libcxx/modules/std/cwchar.inc
@@ -8,7 +8,7 @@
//===----------------------------------------------------------------------===//
export namespace std {
-#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
+#if _LIBCPP_HAS_WIDE_CHARACTERS
using std::mbstate_t _LIBCPP_USING_IF_EXISTS;
using std::size_t _LIBCPP_USING_IF_EXISTS;
using std::wint_t _LIBCPP_USING_IF_EXISTS;
@@ -76,5 +76,5 @@ export namespace std {
using std::mbsrtowcs _LIBCPP_USING_IF_EXISTS;
using std::wcrtomb _LIBCPP_USING_IF_EXISTS;
using std::wcsrtombs _LIBCPP_USING_IF_EXISTS;
-#endif // _LIBCPP_HAS_NO_WIDE_CHARACTERS
+#endif // _LIBCPP_HAS_WIDE_CHARACTERS
} // namespace std
diff --git a/libcxx/modules/std/cwctype.inc b/libcxx/modules/std/cwctype.inc
index 30e526a..5d755d5 100644
--- a/libcxx/modules/std/cwctype.inc
+++ b/libcxx/modules/std/cwctype.inc
@@ -8,7 +8,7 @@
//===----------------------------------------------------------------------===//
export namespace std {
-#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
+#if _LIBCPP_HAS_WIDE_CHARACTERS
using std::wctrans_t _LIBCPP_USING_IF_EXISTS;
using std::wctype_t _LIBCPP_USING_IF_EXISTS;
using std::wint_t _LIBCPP_USING_IF_EXISTS;
@@ -31,5 +31,5 @@ export namespace std {
using std::towupper _LIBCPP_USING_IF_EXISTS;
using std::wctrans _LIBCPP_USING_IF_EXISTS;
using std::wctype _LIBCPP_USING_IF_EXISTS;
-#endif // _LIBCPP_HAS_NO_WIDE_CHARACTERS
+#endif // _LIBCPP_HAS_WIDE_CHARACTERS
} // namespace std
diff --git a/libcxx/modules/std/filesystem.inc b/libcxx/modules/std/filesystem.inc
index 3214b49f..0437a32 100644
--- a/libcxx/modules/std/filesystem.inc
+++ b/libcxx/modules/std/filesystem.inc
@@ -18,7 +18,7 @@ export namespace std::filesystem {
// [fs.class.filesystem.error], filesystem errors
using std::filesystem::filesystem_error;
-#ifndef _LIBCPP_HAS_NO_FILESYSTEM
+#if _LIBCPP_HAS_FILESYSTEM
// [fs.class.directory.entry], directory entries
using std::filesystem::directory_entry;
@@ -31,7 +31,7 @@ export namespace std::filesystem {
// [fs.class.rec.dir.itr], recursive directory iterators
using std::filesystem::recursive_directory_iterator;
-#endif // _LIBCPP_HAS_NO_FILESYSTEM
+#endif // _LIBCPP_HAS_FILESYSTEM
// [fs.rec.dir.itr.nonmembers], range access for recursive directory iterators
@@ -58,7 +58,7 @@ export namespace std::filesystem {
using std::filesystem::operator|=;
using std::filesystem::operator~;
-#ifndef _LIBCPP_HAS_NO_FILESYSTEM
+#if _LIBCPP_HAS_FILESYSTEM
// [fs.op.funcs], filesystem operations
using std::filesystem::absolute;
using std::filesystem::canonical;
@@ -102,7 +102,7 @@ export namespace std::filesystem {
using std::filesystem::symlink_status;
using std::filesystem::temp_directory_path;
using std::filesystem::weakly_canonical;
-#endif // _LIBCPP_HAS_NO_FILESYSTEM
+#endif // _LIBCPP_HAS_FILESYSTEM
// [depr.fs.path.factory]
using std::filesystem::u8path;
@@ -114,8 +114,8 @@ export namespace std {
}
export namespace std::ranges {
-#ifndef _LIBCPP_HAS_NO_FILESYSTEM
+#if _LIBCPP_HAS_FILESYSTEM
using std::ranges::enable_borrowed_range;
using std::ranges::enable_view;
-#endif // _LIBCPP_HAS_NO_FILESYSTEM
+#endif // _LIBCPP_HAS_FILESYSTEM
} // namespace std::ranges
diff --git a/libcxx/modules/std/format.inc b/libcxx/modules/std/format.inc
index 8daf0de..fb0f971 100644
--- a/libcxx/modules/std/format.inc
+++ b/libcxx/modules/std/format.inc
@@ -11,21 +11,21 @@ export namespace std {
// [format.context], class template basic_format_context
using std::basic_format_context;
using std::format_context;
-#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
+#if _LIBCPP_HAS_WIDE_CHARACTERS
using std::wformat_context;
#endif
// [format.args], class template basic_format_args
using std::basic_format_args;
using std::format_args;
-#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
+#if _LIBCPP_HAS_WIDE_CHARACTERS
using std::wformat_args;
#endif
// [format.fmt.string], class template basic_format_string
using std::basic_format_string;
using std::format_string;
-#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
+#if _LIBCPP_HAS_WIDE_CHARACTERS
using std::wformat_string;
#endif
#if _LIBCPP_STD_VER >= 26
@@ -55,7 +55,7 @@ export namespace std {
// [format.parse.ctx], class template basic_format_parse_context
using std::basic_format_parse_context;
using std::format_parse_context;
-#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
+#if _LIBCPP_HAS_WIDE_CHARACTERS
using std::wformat_parse_context;
#endif
@@ -75,7 +75,7 @@ export namespace std {
// [format.arg.store], class template format-arg-store
using std::make_format_args;
-#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
+#if _LIBCPP_HAS_WIDE_CHARACTERS
using std::make_wformat_args;
#endif
diff --git a/libcxx/modules/std/fstream.inc b/libcxx/modules/std/fstream.inc
index b001794..1773c55 100644
--- a/libcxx/modules/std/fstream.inc
+++ b/libcxx/modules/std/fstream.inc
@@ -8,37 +8,37 @@
//===----------------------------------------------------------------------===//
export namespace std {
-#ifndef _LIBCPP_HAS_NO_LOCALIZATION
+#if _LIBCPP_HAS_LOCALIZATION
using std::basic_filebuf;
-# ifndef _LIBCPP_HAS_NO_FILESYSTEM
+# if _LIBCPP_HAS_FILESYSTEM
using std::swap;
# endif
using std::filebuf;
-# ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
+# if _LIBCPP_HAS_WIDE_CHARACTERS
using std::wfilebuf;
# endif
using std::basic_ifstream;
using std::ifstream;
-# ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
+# if _LIBCPP_HAS_WIDE_CHARACTERS
using std::wifstream;
# endif
using std::basic_ofstream;
using std::ofstream;
-# ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
+# if _LIBCPP_HAS_WIDE_CHARACTERS
using std::wofstream;
# endif
using std::basic_fstream;
using std::fstream;
-# ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
+# if _LIBCPP_HAS_WIDE_CHARACTERS
using std::wfstream;
# endif
-#endif // _LIBCPP_HAS_NO_LOCALIZATION
+#endif // _LIBCPP_HAS_LOCALIZATION
} // namespace std
diff --git a/libcxx/modules/std/future.inc b/libcxx/modules/std/future.inc
index 2500ad1..1abf9b3 100644
--- a/libcxx/modules/std/future.inc
+++ b/libcxx/modules/std/future.inc
@@ -8,7 +8,7 @@
//===----------------------------------------------------------------------===//
export namespace std {
-#ifndef _LIBCPP_HAS_NO_THREADS
+#if _LIBCPP_HAS_THREADS
using std::future_errc;
using std::future_status;
using std::launch;
@@ -51,5 +51,5 @@ export namespace std {
// [futures.async], function template async
using std::async;
-#endif // _LIBCPP_HAS_NO_THREADS
+#endif // _LIBCPP_HAS_THREADS
} // namespace std
diff --git a/libcxx/modules/std/iomanip.inc b/libcxx/modules/std/iomanip.inc
index 35a52ef..f525f81 100644
--- a/libcxx/modules/std/iomanip.inc
+++ b/libcxx/modules/std/iomanip.inc
@@ -8,7 +8,7 @@
//===----------------------------------------------------------------------===//
export namespace std {
-#ifndef _LIBCPP_HAS_NO_LOCALIZATION
+#if _LIBCPP_HAS_LOCALIZATION
using std::get_money;
using std::get_time;
using std::put_money;
@@ -21,5 +21,5 @@ export namespace std {
using std::setw;
using std::quoted;
-#endif // _LIBCPP_HAS_NO_LOCALIZATION
+#endif // _LIBCPP_HAS_LOCALIZATION
} // namespace std
diff --git a/libcxx/modules/std/ios.inc b/libcxx/modules/std/ios.inc
index eeed539..d9e1e97 100644
--- a/libcxx/modules/std/ios.inc
+++ b/libcxx/modules/std/ios.inc
@@ -8,7 +8,7 @@
//===----------------------------------------------------------------------===//
export namespace std {
-#ifndef _LIBCPP_HAS_NO_LOCALIZATION
+#if _LIBCPP_HAS_LOCALIZATION
using std::fpos;
// based on [tab:fpos.operations]
using std::operator!=; // Note not affected by P1614, seems like a bug.
@@ -69,8 +69,8 @@ export namespace std {
// [iosfwd.syn]
using std::ios;
-# ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
+# if _LIBCPP_HAS_WIDE_CHARACTERS
using std::wios;
# endif
-#endif // _LIBCPP_HAS_NO_LOCALIZATION
+#endif // _LIBCPP_HAS_LOCALIZATION
} // namespace std
diff --git a/libcxx/modules/std/iosfwd.inc b/libcxx/modules/std/iosfwd.inc
index 952057d..81bddde 100644
--- a/libcxx/modules/std/iosfwd.inc
+++ b/libcxx/modules/std/iosfwd.inc
@@ -9,7 +9,7 @@
export namespace std {
using std::streampos;
-#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
+#if _LIBCPP_HAS_WIDE_CHARACTERS
using std::wstreampos;
#endif
using std::u16streampos;
@@ -30,7 +30,7 @@ export namespace std {
using std::osyncstream;
using std::syncbuf;
-# ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
+# if _LIBCPP_HAS_WIDE_CHARACTERS
using std::wosyncstream;
using std::wsyncbuf;
# endif
diff --git a/libcxx/modules/std/iostream.inc b/libcxx/modules/std/iostream.inc
index d6e2036..76ff9492 100644
--- a/libcxx/modules/std/iostream.inc
+++ b/libcxx/modules/std/iostream.inc
@@ -8,17 +8,17 @@
//===----------------------------------------------------------------------===//
export namespace std {
-#ifndef _LIBCPP_HAS_NO_LOCALIZATION
+#if _LIBCPP_HAS_LOCALIZATION
using std::cerr;
using std::cin;
using std::clog;
using std::cout;
-# ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
+# if _LIBCPP_HAS_WIDE_CHARACTERS
using std::wcerr;
using std::wcin;
using std::wclog;
using std::wcout;
# endif
-#endif // _LIBCPP_HAS_NO_LOCALIZATION
+#endif // _LIBCPP_HAS_LOCALIZATION
} // namespace std
diff --git a/libcxx/modules/std/istream.inc b/libcxx/modules/std/istream.inc
index fdb1854..19fcd5d 100644
--- a/libcxx/modules/std/istream.inc
+++ b/libcxx/modules/std/istream.inc
@@ -8,23 +8,23 @@
//===----------------------------------------------------------------------===//
export namespace std {
-#ifndef _LIBCPP_HAS_NO_LOCALIZATION
+#if _LIBCPP_HAS_LOCALIZATION
using std::basic_istream;
using std::istream;
-# ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
+# if _LIBCPP_HAS_WIDE_CHARACTERS
using std::wistream;
# endif
using std::basic_iostream;
using std::iostream;
-# ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
+# if _LIBCPP_HAS_WIDE_CHARACTERS
using std::wiostream;
# endif
using std::ws;
using std::operator>>;
-#endif // _LIBCPP_HAS_NO_LOCALIZATION
+#endif // _LIBCPP_HAS_LOCALIZATION
} // namespace std
diff --git a/libcxx/modules/std/latch.inc b/libcxx/modules/std/latch.inc
index 922a55e..c64be15 100644
--- a/libcxx/modules/std/latch.inc
+++ b/libcxx/modules/std/latch.inc
@@ -8,7 +8,7 @@
//===----------------------------------------------------------------------===//
export namespace std {
-#ifndef _LIBCPP_HAS_NO_THREADS
+#if _LIBCPP_HAS_THREADS
using std::latch;
-#endif // _LIBCPP_HAS_NO_THREADS
+#endif // _LIBCPP_HAS_THREADS
} // namespace std
diff --git a/libcxx/modules/std/locale.inc b/libcxx/modules/std/locale.inc
index 8975453..cdc7441e 100644
--- a/libcxx/modules/std/locale.inc
+++ b/libcxx/modules/std/locale.inc
@@ -8,7 +8,7 @@
//===----------------------------------------------------------------------===//
export namespace std {
-#ifndef _LIBCPP_HAS_NO_LOCALIZATION
+#if _LIBCPP_HAS_LOCALIZATION
// [locale], locale
using std::has_facet;
using std::locale;
@@ -77,5 +77,5 @@ export namespace std {
# endif // _LIBCPP_STD_VER < 26 || defined(_LIBCPP_ENABLE_CXX26_REMOVED_WSTRING_CONVERT)
-#endif // _LIBCPP_HAS_NO_LOCALIZATION
+#endif // _LIBCPP_HAS_LOCALIZATION
} // namespace std
diff --git a/libcxx/modules/std/memory.inc b/libcxx/modules/std/memory.inc
index 4c4cccf..82056e4 100644
--- a/libcxx/modules/std/memory.inc
+++ b/libcxx/modules/std/memory.inc
@@ -191,7 +191,7 @@ export namespace std {
using std::inout_ptr;
#endif // _LIBCPP_STD_VER >= 23
-#ifndef _LIBCPP_HAS_NO_THREADS
+#if _LIBCPP_HAS_THREADS
// [depr.util.smartptr.shared.atomic]
using std::atomic_is_lock_free;
@@ -208,5 +208,5 @@ export namespace std {
using std::atomic_compare_exchange_strong_explicit;
using std::atomic_compare_exchange_weak;
using std::atomic_compare_exchange_weak_explicit;
-#endif // _LIBCPP_HAS_NO_THREADS
+#endif // _LIBCPP_HAS_THREADS
} // namespace std
diff --git a/libcxx/modules/std/mutex.inc b/libcxx/modules/std/mutex.inc
index 24c7f2e..7a125064 100644
--- a/libcxx/modules/std/mutex.inc
+++ b/libcxx/modules/std/mutex.inc
@@ -8,7 +8,7 @@
//===----------------------------------------------------------------------===//
export namespace std {
-#ifndef _LIBCPP_HAS_NO_THREADS
+#if _LIBCPP_HAS_THREADS
// [thread.mutex.class], class mutex
using std::mutex;
// [thread.mutex.recursive], class recursive_mutex
@@ -36,7 +36,7 @@ export namespace std {
// [thread.lock.algorithm], generic locking algorithms
using std::lock;
using std::try_lock;
-#endif // _LIBCPP_HAS_NO_THREADS
+#endif // _LIBCPP_HAS_THREADS
using std::once_flag;
diff --git a/libcxx/modules/std/ostream.inc b/libcxx/modules/std/ostream.inc
index 0e0e2d54..e124e66 100644
--- a/libcxx/modules/std/ostream.inc
+++ b/libcxx/modules/std/ostream.inc
@@ -8,11 +8,11 @@
//===----------------------------------------------------------------------===//
export namespace std {
-#ifndef _LIBCPP_HAS_NO_LOCALIZATION
+#if _LIBCPP_HAS_LOCALIZATION
using std::basic_ostream;
using std::ostream;
-# ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
+# if _LIBCPP_HAS_WIDE_CHARACTERS
using std::wostream;
# endif
@@ -33,10 +33,10 @@ export namespace std {
using std::println;
using std::vprint_nonunicode;
-# ifndef _LIBCPP_HAS_NO_UNICODE
+# if _LIBCPP_HAS_UNICODE
using std::vprint_unicode;
-# endif // _LIBCPP_HAS_NO_UNICODE
+# endif // _LIBCPP_HAS_UNICODE
# endif // _LIBCPP_STD_VER >= 23
-#endif // _LIBCPP_HAS_NO_LOCALIZATION
+#endif // _LIBCPP_HAS_LOCALIZATION
} // namespace std
diff --git a/libcxx/modules/std/print.inc b/libcxx/modules/std/print.inc
index 1ca52c7..5354025 100644
--- a/libcxx/modules/std/print.inc
+++ b/libcxx/modules/std/print.inc
@@ -14,8 +14,8 @@ export namespace std {
using std::println;
using std::vprint_nonunicode;
-# ifndef _LIBCPP_HAS_NO_UNICODE
+# if _LIBCPP_HAS_UNICODE
using std::vprint_unicode;
-# endif // _LIBCPP_HAS_NO_UNICODE
+# endif // _LIBCPP_HAS_UNICODE
#endif // _LIBCPP_STD_VER >= 23
} // namespace std
diff --git a/libcxx/modules/std/random.inc b/libcxx/modules/std/random.inc
index 0b003fd..0ab6945 100644
--- a/libcxx/modules/std/random.inc
+++ b/libcxx/modules/std/random.inc
@@ -42,7 +42,7 @@ export namespace std {
using std::default_random_engine;
-#ifndef _LIBCPP_HAS_NO_RANDOM_DEVICE
+#if _LIBCPP_HAS_RANDOM_DEVICE
// [rand.device], class random_device
using std::random_device;
#endif
diff --git a/libcxx/modules/std/ranges.inc b/libcxx/modules/std/ranges.inc
index f71efe9..a5e2a2b 100644
--- a/libcxx/modules/std/ranges.inc
+++ b/libcxx/modules/std/ranges.inc
@@ -125,18 +125,18 @@ export namespace std {
} // namespace views
#endif // _LIBCPP_STD_VER >= 23
-#ifndef _LIBCPP_HAS_NO_LOCALIZATION
+#if _LIBCPP_HAS_LOCALIZATION
// [range.istream], istream view
using std::ranges::basic_istream_view;
using std::ranges::istream_view;
-# ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
+# if _LIBCPP_HAS_WIDE_CHARACTERS
using std::ranges::wistream_view;
# endif
namespace views {
using std::ranges::views::istream;
}
-#endif // _LIBCPP_HAS_NO_LOCALIZATION
+#endif // _LIBCPP_HAS_LOCALIZATION
// Note: This declaration not in the synopsis or explicitly in the wording.
// However it is needed for the range adaptors.
diff --git a/libcxx/modules/std/regex.inc b/libcxx/modules/std/regex.inc
index 8217e34..9d0c580 100644
--- a/libcxx/modules/std/regex.inc
+++ b/libcxx/modules/std/regex.inc
@@ -8,7 +8,7 @@
//===----------------------------------------------------------------------===//
export namespace std {
-#ifndef _LIBCPP_HAS_NO_LOCALIZATION
+#if _LIBCPP_HAS_LOCALIZATION
// [re.const], regex constants
namespace regex_constants {
using std::regex_constants::error_type;
@@ -37,7 +37,7 @@ export namespace std {
using std::basic_regex;
using std::regex;
-# ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
+# if _LIBCPP_HAS_WIDE_CHARACTERS
using std::wregex;
# endif
@@ -49,7 +49,7 @@ export namespace std {
using std::csub_match;
using std::ssub_match;
-# ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
+# if _LIBCPP_HAS_WIDE_CHARACTERS
using std::wcsub_match;
using std::wssub_match;
# endif
@@ -65,7 +65,7 @@ export namespace std {
using std::cmatch;
using std::smatch;
-# ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
+# if _LIBCPP_HAS_WIDE_CHARACTERS
using std::wcmatch;
using std::wsmatch;
# endif
@@ -88,7 +88,7 @@ export namespace std {
using std::cregex_iterator;
using std::sregex_iterator;
-# ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
+# if _LIBCPP_HAS_WIDE_CHARACTERS
using std::wcregex_iterator;
using std::wsregex_iterator;
# endif
@@ -98,7 +98,7 @@ export namespace std {
using std::cregex_token_iterator;
using std::sregex_token_iterator;
-# ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
+# if _LIBCPP_HAS_WIDE_CHARACTERS
using std::wcregex_token_iterator;
using std::wsregex_token_iterator;
# endif
@@ -108,10 +108,10 @@ export namespace std {
using std::pmr::cmatch;
using std::pmr::smatch;
-# ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
+# if _LIBCPP_HAS_WIDE_CHARACTERS
using std::pmr::wcmatch;
using std::pmr::wsmatch;
# endif
} // namespace pmr
-#endif // _LIBCPP_HAS_NO_LOCALIZATION
+#endif // _LIBCPP_HAS_LOCALIZATION
} // namespace std
diff --git a/libcxx/modules/std/semaphore.inc b/libcxx/modules/std/semaphore.inc
index a8c8a1b..7b47554 100644
--- a/libcxx/modules/std/semaphore.inc
+++ b/libcxx/modules/std/semaphore.inc
@@ -8,10 +8,10 @@
//===----------------------------------------------------------------------===//
export namespace std {
-#ifndef _LIBCPP_HAS_NO_THREADS
+#if _LIBCPP_HAS_THREADS
// [thread.sema.cnt], class template counting_semaphore
using std::counting_semaphore;
using std::binary_semaphore;
-#endif // _LIBCPP_HAS_NO_THREADS
+#endif // _LIBCPP_HAS_THREADS
} // namespace std
diff --git a/libcxx/modules/std/shared_mutex.inc b/libcxx/modules/std/shared_mutex.inc
index 5f09446..95102fc 100644
--- a/libcxx/modules/std/shared_mutex.inc
+++ b/libcxx/modules/std/shared_mutex.inc
@@ -8,7 +8,7 @@
//===----------------------------------------------------------------------===//
export namespace std {
-#ifndef _LIBCPP_HAS_NO_THREADS
+#if _LIBCPP_HAS_THREADS
// [thread.sharedmutex.class], class shared_­mutex
using std::shared_mutex;
// [thread.sharedtimedmutex.class], class shared_­timed_­mutex
@@ -16,5 +16,5 @@ export namespace std {
// [thread.lock.shared], class template shared_­lock
using std::shared_lock;
using std::swap;
-#endif // _LIBCPP_HAS_NO_THREADS
+#endif // _LIBCPP_HAS_THREADS
} // namespace std
diff --git a/libcxx/modules/std/spanstream.inc b/libcxx/modules/std/spanstream.inc
index e6383a1..e5b096e 100644
--- a/libcxx/modules/std/spanstream.inc
+++ b/libcxx/modules/std/spanstream.inc
@@ -14,28 +14,28 @@ export namespace std {
using std::swap;
using std::spanbuf;
-# ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
+# if _LIBCPP_HAS_WIDE_CHARACTERS
using std::wspanbuf;
# endif
using std::basic_ispanstream;
using std::ispanstream;
-# ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
+# if _LIBCPP_HAS_WIDE_CHARACTERS
using std::wispanstream;
# endif
using std::basic_ospanstream;
using std::ospanstream;
-# ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
+# if _LIBCPP_HAS_WIDE_CHARACTERS
using std::wospanstream;
# endif
using std::basic_spanstream;
using std::spanstream;
-# ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
+# if _LIBCPP_HAS_WIDE_CHARACTERS
using std::wspanstream;
# endif
#endif
diff --git a/libcxx/modules/std/sstream.inc b/libcxx/modules/std/sstream.inc
index 2218001..99ec3b3 100644
--- a/libcxx/modules/std/sstream.inc
+++ b/libcxx/modules/std/sstream.inc
@@ -8,35 +8,35 @@
//===----------------------------------------------------------------------===//
export namespace std {
-#ifndef _LIBCPP_HAS_NO_LOCALIZATION
+#if _LIBCPP_HAS_LOCALIZATION
using std::basic_stringbuf;
using std::swap;
using std::stringbuf;
-# ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
+# if _LIBCPP_HAS_WIDE_CHARACTERS
using std::wstringbuf;
# endif
using std::basic_istringstream;
using std::istringstream;
-# ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
+# if _LIBCPP_HAS_WIDE_CHARACTERS
using std::wistringstream;
# endif
using std::basic_ostringstream;
using std::ostringstream;
-# ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
+# if _LIBCPP_HAS_WIDE_CHARACTERS
using std::wostringstream;
# endif
using std::basic_stringstream;
using std::stringstream;
-# ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
+# if _LIBCPP_HAS_WIDE_CHARACTERS
using std::wstringstream;
# endif
-#endif // _LIBCPP_HAS_NO_LOCALIZATION
+#endif // _LIBCPP_HAS_LOCALIZATION
} // namespace std
diff --git a/libcxx/modules/std/stop_token.inc b/libcxx/modules/std/stop_token.inc
index 5daf460..b5c7eb2 100644
--- a/libcxx/modules/std/stop_token.inc
+++ b/libcxx/modules/std/stop_token.inc
@@ -8,7 +8,7 @@
//===----------------------------------------------------------------------===//
export namespace std {
-#ifndef _LIBCPP_HAS_NO_THREADS
+#if _LIBCPP_HAS_THREADS
// [stoptoken], class stop_­token
using std::stop_token;
@@ -21,5 +21,5 @@ export namespace std {
// [stopcallback], class template stop_­callback
using std::stop_callback;
-#endif // _LIBCPP_HAS_NO_THREADS
+#endif // _LIBCPP_HAS_THREADS
} // namespace std
diff --git a/libcxx/modules/std/streambuf.inc b/libcxx/modules/std/streambuf.inc
index 32914cf..fac0767 100644
--- a/libcxx/modules/std/streambuf.inc
+++ b/libcxx/modules/std/streambuf.inc
@@ -8,11 +8,11 @@
//===----------------------------------------------------------------------===//
export namespace std {
-#ifndef _LIBCPP_HAS_NO_LOCALIZATION
+#if _LIBCPP_HAS_LOCALIZATION
using std::basic_streambuf;
using std::streambuf;
-# ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
+# if _LIBCPP_HAS_WIDE_CHARACTERS
using std::wstreambuf;
# endif
-#endif // _LIBCPP_HAS_NO_LOCALIZATION
+#endif // _LIBCPP_HAS_LOCALIZATION
} // namespace std
diff --git a/libcxx/modules/std/string.inc b/libcxx/modules/std/string.inc
index 322317c9..8e14be8 100644
--- a/libcxx/modules/std/string.inc
+++ b/libcxx/modules/std/string.inc
@@ -37,7 +37,7 @@ export namespace std {
#if _LIBCPP_HAS_CHAR8_T
using std::u8string;
#endif
-#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
+#if _LIBCPP_HAS_WIDE_CHARACTERS
using std::wstring;
#endif
@@ -51,7 +51,7 @@ export namespace std {
using std::stoul;
using std::stoull;
using std::to_string;
-#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
+#if _LIBCPP_HAS_WIDE_CHARACTERS
using std::to_wstring;
#endif
@@ -63,7 +63,7 @@ export namespace std {
#if _LIBCPP_HAS_CHAR8_T
using std::pmr::u8string;
#endif
-#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
+#if _LIBCPP_HAS_WIDE_CHARACTERS
using std::pmr::wstring;
#endif
} // namespace pmr
diff --git a/libcxx/modules/std/string_view.inc b/libcxx/modules/std/string_view.inc
index 1237f45..4de1c8b 100644
--- a/libcxx/modules/std/string_view.inc
+++ b/libcxx/modules/std/string_view.inc
@@ -30,7 +30,7 @@ export namespace std {
#if _LIBCPP_HAS_CHAR8_T
using std::u8string_view;
#endif
-#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
+#if _LIBCPP_HAS_WIDE_CHARACTERS
using std::wstring_view;
#endif
diff --git a/libcxx/modules/std/strstream.inc b/libcxx/modules/std/strstream.inc
index 8087967..5b9d45a 100644
--- a/libcxx/modules/std/strstream.inc
+++ b/libcxx/modules/std/strstream.inc
@@ -8,12 +8,12 @@
//===----------------------------------------------------------------------===//
export namespace std {
-#ifndef _LIBCPP_HAS_NO_LOCALIZATION
+#if _LIBCPP_HAS_LOCALIZATION
# if _LIBCPP_STD_VER < 26 || defined(_LIBCPP_ENABLE_CXX26_REMOVED_STRSTREAM)
using std::istrstream;
using std::ostrstream;
using std::strstream;
using std::strstreambuf;
# endif // _LIBCPP_STD_VER < 26 || defined(_LIBCPP_ENABLE_CXX26_REMOVED_STRSTREAM)
-#endif // _LIBCPP_HAS_NO_LOCALIZATION
+#endif // _LIBCPP_HAS_LOCALIZATION
} // namespace std
diff --git a/libcxx/modules/std/syncstream.inc b/libcxx/modules/std/syncstream.inc
index e3fb391..ed4cae0 100644
--- a/libcxx/modules/std/syncstream.inc
+++ b/libcxx/modules/std/syncstream.inc
@@ -8,21 +8,21 @@
//===----------------------------------------------------------------------===//
export namespace std {
-#if !defined(_LIBCPP_HAS_NO_LOCALIZATION) && !defined(_LIBCPP_HAS_NO_EXPERIMENTAL_SYNCSTREAM)
+#if _LIBCPP_HAS_LOCALIZATION && !defined(_LIBCPP_HAS_NO_EXPERIMENTAL_SYNCSTREAM)
using std::basic_syncbuf;
// [syncstream.syncbuf.special], specialized algorithms
using std::swap;
using std::syncbuf;
-# ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
+# if _LIBCPP_HAS_WIDE_CHARACTERS
using std::wsyncbuf;
# endif
using std::basic_osyncstream;
using std::osyncstream;
-# ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
+# if _LIBCPP_HAS_WIDE_CHARACTERS
using std::wosyncstream;
# endif
-#endif // !defined(_LIBCPP_HAS_NO_LOCALIZATION) && !defined(_LIBCPP_HAS_NO_EXPERIMENTAL_SYNCSTREAM)
+#endif // _LIBCPP_HAS_LOCALIZATION && !defined(_LIBCPP_HAS_NO_EXPERIMENTAL_SYNCSTREAM)
} // namespace std
diff --git a/libcxx/modules/std/thread.inc b/libcxx/modules/std/thread.inc
index 61e3191..694539e 100644
--- a/libcxx/modules/std/thread.inc
+++ b/libcxx/modules/std/thread.inc
@@ -8,7 +8,7 @@
//===----------------------------------------------------------------------===//
export namespace std {
-#ifndef _LIBCPP_HAS_NO_THREADS
+#if _LIBCPP_HAS_THREADS
// [thread.thread.class], class thread
using std::thread;
@@ -29,14 +29,14 @@ export namespace std {
// [thread.thread.id]
using std::operator==;
using std::operator<=>;
-# ifndef _LIBCPP_HAS_NO_LOCALIZATION
+# if _LIBCPP_HAS_LOCALIZATION
using std::operator<<;
-# endif // _LIBCPP_HAS_NO_LOCALIZATION
+# endif // _LIBCPP_HAS_LOCALIZATION
# if _LIBCPP_STD_VER >= 23
using std::formatter;
# endif
using std::hash;
-#endif // _LIBCPP_HAS_NO_THREADS
+#endif // _LIBCPP_HAS_THREADS
} // namespace std