6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__algorithm/three_way_comp_ref_type.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___ALGORITHM_THREE_WAY_COMP_REF_TYPE_H
#define _LIBCPP___ALGORITHM_THREE_WAY_COMP_REF_TYPE_H
#ifndef _LIBCPP___CXX03___ALGORITHM_THREE_WAY_COMP_REF_TYPE_H
#define _LIBCPP___CXX03___ALGORITHM_THREE_WAY_COMP_REF_TYPE_H

#include <__cxx03/__assert>
#include <__cxx03/__compare/ordering.h>
Expand Down Expand Up @@ -71,4 +71,4 @@ using __three_way_comp_ref_type = _Comp&;

_LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP___ALGORITHM_THREE_WAY_COMP_REF_TYPE_H
#endif // _LIBCPP___CXX03___ALGORITHM_THREE_WAY_COMP_REF_TYPE_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__algorithm/transform.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___ALGORITHM_TRANSFORM_H
#define _LIBCPP___ALGORITHM_TRANSFORM_H
#ifndef _LIBCPP___CXX03___ALGORITHM_TRANSFORM_H
#define _LIBCPP___CXX03___ALGORITHM_TRANSFORM_H

#include <__cxx03/__config>

Expand Down Expand Up @@ -39,4 +39,4 @@ inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _OutputIterator trans

_LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP___ALGORITHM_TRANSFORM_H
#endif // _LIBCPP___CXX03___ALGORITHM_TRANSFORM_H
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___ALGORITHM_RANGES_UNIFORM_RANDOM_BIT_GENERATOR_ADAPTOR_H
#define _LIBCPP___ALGORITHM_RANGES_UNIFORM_RANDOM_BIT_GENERATOR_ADAPTOR_H
#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_UNIFORM_RANDOM_BIT_GENERATOR_ADAPTOR_H
#define _LIBCPP___CXX03___ALGORITHM_RANGES_UNIFORM_RANDOM_BIT_GENERATOR_ADAPTOR_H

#include <__cxx03/__config>
#include <__cxx03/__functional/invoke.h>
Expand Down Expand Up @@ -55,4 +55,4 @@ _LIBCPP_POP_MACROS

#endif // _LIBCPP_STD_VER >= 20

#endif // _LIBCPP___ALGORITHM_RANGES_UNIFORM_RANDOM_BIT_GENERATOR_ADAPTOR_H
#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_UNIFORM_RANDOM_BIT_GENERATOR_ADAPTOR_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__algorithm/unique.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___ALGORITHM_UNIQUE_H
#define _LIBCPP___ALGORITHM_UNIQUE_H
#ifndef _LIBCPP___CXX03___ALGORITHM_UNIQUE_H
#define _LIBCPP___CXX03___ALGORITHM_UNIQUE_H

#include <__cxx03/__algorithm/adjacent_find.h>
#include <__cxx03/__algorithm/comp.h>
Expand Down Expand Up @@ -61,4 +61,4 @@ _LIBCPP_END_NAMESPACE_STD

_LIBCPP_POP_MACROS

#endif // _LIBCPP___ALGORITHM_UNIQUE_H
#endif // _LIBCPP___CXX03___ALGORITHM_UNIQUE_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__algorithm/unique_copy.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___ALGORITHM_UNIQUE_COPY_H
#define _LIBCPP___ALGORITHM_UNIQUE_COPY_H
#ifndef _LIBCPP___CXX03___ALGORITHM_UNIQUE_COPY_H
#define _LIBCPP___CXX03___ALGORITHM_UNIQUE_COPY_H

#include <__cxx03/__algorithm/comp.h>
#include <__cxx03/__algorithm/iterator_operations.h>
Expand Down Expand Up @@ -124,4 +124,4 @@ _LIBCPP_END_NAMESPACE_STD

_LIBCPP_POP_MACROS

#endif // _LIBCPP___ALGORITHM_UNIQUE_COPY_H
#endif // _LIBCPP___CXX03___ALGORITHM_UNIQUE_COPY_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__algorithm/unwrap_iter.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___ALGORITHM_UNWRAP_ITER_H
#define _LIBCPP___ALGORITHM_UNWRAP_ITER_H
#ifndef _LIBCPP___CXX03___ALGORITHM_UNWRAP_ITER_H
#define _LIBCPP___CXX03___ALGORITHM_UNWRAP_ITER_H

#include <__cxx03/__config>
#include <__cxx03/__iterator/iterator_traits.h>
Expand Down Expand Up @@ -82,4 +82,4 @@ _LIBCPP_END_NAMESPACE_STD

_LIBCPP_POP_MACROS

#endif // _LIBCPP___ALGORITHM_UNWRAP_ITER_H
#endif // _LIBCPP___CXX03___ALGORITHM_UNWRAP_ITER_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__algorithm/unwrap_range.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___ALGORITHM_UNWRAP_RANGE_H
#define _LIBCPP___ALGORITHM_UNWRAP_RANGE_H
#ifndef _LIBCPP___CXX03___ALGORITHM_UNWRAP_RANGE_H
#define _LIBCPP___CXX03___ALGORITHM_UNWRAP_RANGE_H

#include <__cxx03/__algorithm/unwrap_iter.h>
#include <__cxx03/__concepts/constructible.h>
Expand Down Expand Up @@ -96,4 +96,4 @@ _LIBCPP_END_NAMESPACE_STD

_LIBCPP_POP_MACROS

#endif // _LIBCPP___ALGORITHM_UNWRAP_RANGE_H
#endif // _LIBCPP___CXX03___ALGORITHM_UNWRAP_RANGE_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__algorithm/upper_bound.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___ALGORITHM_UPPER_BOUND_H
#define _LIBCPP___ALGORITHM_UPPER_BOUND_H
#ifndef _LIBCPP___CXX03___ALGORITHM_UPPER_BOUND_H
#define _LIBCPP___CXX03___ALGORITHM_UPPER_BOUND_H

#include <__cxx03/__algorithm/comp.h>
#include <__cxx03/__algorithm/half_positive.h>
Expand Down Expand Up @@ -65,4 +65,4 @@ _LIBCPP_END_NAMESPACE_STD

_LIBCPP_POP_MACROS

#endif // _LIBCPP___ALGORITHM_UPPER_BOUND_H
#endif // _LIBCPP___CXX03___ALGORITHM_UPPER_BOUND_H
110 changes: 55 additions & 55 deletions libcxx/include/__cxx03/__assert
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___ASSERT
#define _LIBCPP___ASSERT
#ifndef _LIBCPP___CXX03___ASSERT
#define _LIBCPP___CXX03___ASSERT

#include <__assertion_handler> // Note: this include is generated by CMake and is potentially vendor-provided.
#include <__cxx03/__config>
Expand All @@ -17,21 +17,21 @@
# pragma GCC system_header
#endif

#define _LIBCPP_ASSERT(expression, message) \
#define _LIBCPP___CXX03_ASSERT(expression, message) \
(__builtin_expect(static_cast<bool>(expression), 1) \
? (void)0 \
: _LIBCPP_ASSERTION_HANDLER(__FILE__ ":" _LIBCPP_TOSTRING(__LINE__) ": assertion " _LIBCPP_TOSTRING( \
: _LIBCPP___CXX03_ASSERTION_HANDLER(__FILE__ ":" _LIBCPP_TOSTRING(__LINE__) ": assertion " _LIBCPP_TOSTRING( \
expression) " failed: " message "\n"))

// TODO: __builtin_assume can currently inhibit optimizations. Until this has been fixed and we can add
// assumptions without a clear optimization intent, disable that to avoid worsening the code generation.
// See https://discourse.llvm.org/t/llvm-assume-blocks-optimization/71609 for a discussion.
#if 0 && __has_builtin(__builtin_assume)
# define _LIBCPP_ASSUME(expression) \
# define _LIBCPP___CXX03_ASSUME(expression) \
(_LIBCPP_DIAGNOSTIC_PUSH _LIBCPP_CLANG_DIAGNOSTIC_IGNORED("-Wassume") \
__builtin_assume(static_cast<bool>(expression)) _LIBCPP_DIAGNOSTIC_POP)
#else
# define _LIBCPP_ASSUME(expression) ((void)0)
# define _LIBCPP___CXX03_ASSUME(expression) ((void)0)
#endif

// clang-format off
Expand All @@ -40,79 +40,79 @@
#if _LIBCPP_HARDENING_MODE == _LIBCPP_HARDENING_MODE_FAST

// Enabled checks.
# define _LIBCPP_ASSERT_VALID_INPUT_RANGE(expression, message) _LIBCPP_ASSERT(expression, message)
# define _LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(expression, message) _LIBCPP_ASSERT(expression, message)
# define _LIBCPP_ASSERT_VALID_INPUT_RANGE(expression, message) _LIBCPP___CXX03_ASSERT(expression, message)
# define _LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(expression, message) _LIBCPP___CXX03_ASSERT(expression, message)
// Disabled checks.
// On most modern platforms, dereferencing a null pointer does not lead to an actual memory access.
# define _LIBCPP_ASSERT_NON_NULL(expression, message) _LIBCPP_ASSUME(expression)
# define _LIBCPP_ASSERT_NON_NULL(expression, message) _LIBCPP___CXX03_ASSUME(expression)
// Overlapping ranges will make algorithms produce incorrect results but don't directly lead to a security
// vulnerability.
# define _LIBCPP_ASSERT_NON_OVERLAPPING_RANGES(expression, message) _LIBCPP_ASSUME(expression)
# define _LIBCPP_ASSERT_VALID_DEALLOCATION(expression, message) _LIBCPP_ASSUME(expression)
# define _LIBCPP_ASSERT_VALID_EXTERNAL_API_CALL(expression, message) _LIBCPP_ASSUME(expression)
# define _LIBCPP_ASSERT_COMPATIBLE_ALLOCATOR(expression, message) _LIBCPP_ASSUME(expression)
# define _LIBCPP_ASSERT_ARGUMENT_WITHIN_DOMAIN(expression, message) _LIBCPP_ASSUME(expression)
# define _LIBCPP_ASSERT_PEDANTIC(expression, message) _LIBCPP_ASSUME(expression)
# define _LIBCPP_ASSERT_SEMANTIC_REQUIREMENT(expression, message) _LIBCPP_ASSUME(expression)
# define _LIBCPP_ASSERT_INTERNAL(expression, message) _LIBCPP_ASSUME(expression)
# define _LIBCPP_ASSERT_UNCATEGORIZED(expression, message) _LIBCPP_ASSUME(expression)
# define _LIBCPP_ASSERT_NON_OVERLAPPING_RANGES(expression, message) _LIBCPP___CXX03_ASSUME(expression)
# define _LIBCPP_ASSERT_VALID_DEALLOCATION(expression, message) _LIBCPP___CXX03_ASSUME(expression)
# define _LIBCPP_ASSERT_VALID_EXTERNAL_API_CALL(expression, message) _LIBCPP___CXX03_ASSUME(expression)
# define _LIBCPP_ASSERT_COMPATIBLE_ALLOCATOR(expression, message) _LIBCPP___CXX03_ASSUME(expression)
# define _LIBCPP_ASSERT_ARGUMENT_WITHIN_DOMAIN(expression, message) _LIBCPP___CXX03_ASSUME(expression)
# define _LIBCPP_ASSERT_PEDANTIC(expression, message) _LIBCPP___CXX03_ASSUME(expression)
# define _LIBCPP_ASSERT_SEMANTIC_REQUIREMENT(expression, message) _LIBCPP___CXX03_ASSUME(expression)
# define _LIBCPP_ASSERT_INTERNAL(expression, message) _LIBCPP___CXX03_ASSUME(expression)
# define _LIBCPP_ASSERT_UNCATEGORIZED(expression, message) _LIBCPP___CXX03_ASSUME(expression)

// Extensive hardening mode checks.

#elif _LIBCPP_HARDENING_MODE == _LIBCPP_HARDENING_MODE_EXTENSIVE

// Enabled checks.
# define _LIBCPP_ASSERT_VALID_INPUT_RANGE(expression, message) _LIBCPP_ASSERT(expression, message)
# define _LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(expression, message) _LIBCPP_ASSERT(expression, message)
# define _LIBCPP_ASSERT_NON_NULL(expression, message) _LIBCPP_ASSERT(expression, message)
# define _LIBCPP_ASSERT_NON_OVERLAPPING_RANGES(expression, message) _LIBCPP_ASSERT(expression, message)
# define _LIBCPP_ASSERT_VALID_DEALLOCATION(expression, message) _LIBCPP_ASSERT(expression, message)
# define _LIBCPP_ASSERT_VALID_EXTERNAL_API_CALL(expression, message) _LIBCPP_ASSERT(expression, message)
# define _LIBCPP_ASSERT_COMPATIBLE_ALLOCATOR(expression, message) _LIBCPP_ASSERT(expression, message)
# define _LIBCPP_ASSERT_ARGUMENT_WITHIN_DOMAIN(expression, message) _LIBCPP_ASSERT(expression, message)
# define _LIBCPP_ASSERT_PEDANTIC(expression, message) _LIBCPP_ASSERT(expression, message)
# define _LIBCPP_ASSERT_UNCATEGORIZED(expression, message) _LIBCPP_ASSERT(expression, message)
# define _LIBCPP_ASSERT_VALID_INPUT_RANGE(expression, message) _LIBCPP___CXX03_ASSERT(expression, message)
# define _LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(expression, message) _LIBCPP___CXX03_ASSERT(expression, message)
# define _LIBCPP_ASSERT_NON_NULL(expression, message) _LIBCPP___CXX03_ASSERT(expression, message)
# define _LIBCPP_ASSERT_NON_OVERLAPPING_RANGES(expression, message) _LIBCPP___CXX03_ASSERT(expression, message)
# define _LIBCPP_ASSERT_VALID_DEALLOCATION(expression, message) _LIBCPP___CXX03_ASSERT(expression, message)
# define _LIBCPP_ASSERT_VALID_EXTERNAL_API_CALL(expression, message) _LIBCPP___CXX03_ASSERT(expression, message)
# define _LIBCPP_ASSERT_COMPATIBLE_ALLOCATOR(expression, message) _LIBCPP___CXX03_ASSERT(expression, message)
# define _LIBCPP_ASSERT_ARGUMENT_WITHIN_DOMAIN(expression, message) _LIBCPP___CXX03_ASSERT(expression, message)
# define _LIBCPP_ASSERT_PEDANTIC(expression, message) _LIBCPP___CXX03_ASSERT(expression, message)
# define _LIBCPP_ASSERT_UNCATEGORIZED(expression, message) _LIBCPP___CXX03_ASSERT(expression, message)
// Disabled checks.
# define _LIBCPP_ASSERT_SEMANTIC_REQUIREMENT(expression, message) _LIBCPP_ASSUME(expression)
# define _LIBCPP_ASSERT_INTERNAL(expression, message) _LIBCPP_ASSUME(expression)
# define _LIBCPP_ASSERT_SEMANTIC_REQUIREMENT(expression, message) _LIBCPP___CXX03_ASSUME(expression)
# define _LIBCPP_ASSERT_INTERNAL(expression, message) _LIBCPP___CXX03_ASSUME(expression)

// Debug hardening mode checks.

#elif _LIBCPP_HARDENING_MODE == _LIBCPP_HARDENING_MODE_DEBUG

// All checks enabled.
# define _LIBCPP_ASSERT_VALID_INPUT_RANGE(expression, message) _LIBCPP_ASSERT(expression, message)
# define _LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(expression, message) _LIBCPP_ASSERT(expression, message)
# define _LIBCPP_ASSERT_NON_NULL(expression, message) _LIBCPP_ASSERT(expression, message)
# define _LIBCPP_ASSERT_NON_OVERLAPPING_RANGES(expression, message) _LIBCPP_ASSERT(expression, message)
# define _LIBCPP_ASSERT_VALID_DEALLOCATION(expression, message) _LIBCPP_ASSERT(expression, message)
# define _LIBCPP_ASSERT_VALID_EXTERNAL_API_CALL(expression, message) _LIBCPP_ASSERT(expression, message)
# define _LIBCPP_ASSERT_COMPATIBLE_ALLOCATOR(expression, message) _LIBCPP_ASSERT(expression, message)
# define _LIBCPP_ASSERT_ARGUMENT_WITHIN_DOMAIN(expression, message) _LIBCPP_ASSERT(expression, message)
# define _LIBCPP_ASSERT_PEDANTIC(expression, message) _LIBCPP_ASSERT(expression, message)
# define _LIBCPP_ASSERT_SEMANTIC_REQUIREMENT(expression, message) _LIBCPP_ASSERT(expression, message)
# define _LIBCPP_ASSERT_INTERNAL(expression, message) _LIBCPP_ASSERT(expression, message)
# define _LIBCPP_ASSERT_UNCATEGORIZED(expression, message) _LIBCPP_ASSERT(expression, message)
# define _LIBCPP_ASSERT_VALID_INPUT_RANGE(expression, message) _LIBCPP___CXX03_ASSERT(expression, message)
# define _LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(expression, message) _LIBCPP___CXX03_ASSERT(expression, message)
# define _LIBCPP_ASSERT_NON_NULL(expression, message) _LIBCPP___CXX03_ASSERT(expression, message)
# define _LIBCPP_ASSERT_NON_OVERLAPPING_RANGES(expression, message) _LIBCPP___CXX03_ASSERT(expression, message)
# define _LIBCPP_ASSERT_VALID_DEALLOCATION(expression, message) _LIBCPP___CXX03_ASSERT(expression, message)
# define _LIBCPP_ASSERT_VALID_EXTERNAL_API_CALL(expression, message) _LIBCPP___CXX03_ASSERT(expression, message)
# define _LIBCPP_ASSERT_COMPATIBLE_ALLOCATOR(expression, message) _LIBCPP___CXX03_ASSERT(expression, message)
# define _LIBCPP_ASSERT_ARGUMENT_WITHIN_DOMAIN(expression, message) _LIBCPP___CXX03_ASSERT(expression, message)
# define _LIBCPP_ASSERT_PEDANTIC(expression, message) _LIBCPP___CXX03_ASSERT(expression, message)
# define _LIBCPP_ASSERT_SEMANTIC_REQUIREMENT(expression, message) _LIBCPP___CXX03_ASSERT(expression, message)
# define _LIBCPP_ASSERT_INTERNAL(expression, message) _LIBCPP___CXX03_ASSERT(expression, message)
# define _LIBCPP_ASSERT_UNCATEGORIZED(expression, message) _LIBCPP___CXX03_ASSERT(expression, message)

// Disable all checks if hardening is not enabled.

#else

// All checks disabled.
# define _LIBCPP_ASSERT_VALID_INPUT_RANGE(expression, message) _LIBCPP_ASSUME(expression)
# define _LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(expression, message) _LIBCPP_ASSUME(expression)
# define _LIBCPP_ASSERT_NON_NULL(expression, message) _LIBCPP_ASSUME(expression)
# define _LIBCPP_ASSERT_NON_OVERLAPPING_RANGES(expression, message) _LIBCPP_ASSUME(expression)
# define _LIBCPP_ASSERT_VALID_DEALLOCATION(expression, message) _LIBCPP_ASSUME(expression)
# define _LIBCPP_ASSERT_VALID_EXTERNAL_API_CALL(expression, message) _LIBCPP_ASSUME(expression)
# define _LIBCPP_ASSERT_COMPATIBLE_ALLOCATOR(expression, message) _LIBCPP_ASSUME(expression)
# define _LIBCPP_ASSERT_ARGUMENT_WITHIN_DOMAIN(expression, message) _LIBCPP_ASSUME(expression)
# define _LIBCPP_ASSERT_PEDANTIC(expression, message) _LIBCPP_ASSUME(expression)
# define _LIBCPP_ASSERT_SEMANTIC_REQUIREMENT(expression, message) _LIBCPP_ASSUME(expression)
# define _LIBCPP_ASSERT_INTERNAL(expression, message) _LIBCPP_ASSUME(expression)
# define _LIBCPP_ASSERT_UNCATEGORIZED(expression, message) _LIBCPP_ASSUME(expression)
# define _LIBCPP_ASSERT_VALID_INPUT_RANGE(expression, message) _LIBCPP___CXX03_ASSUME(expression)
# define _LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(expression, message) _LIBCPP___CXX03_ASSUME(expression)
# define _LIBCPP_ASSERT_NON_NULL(expression, message) _LIBCPP___CXX03_ASSUME(expression)
# define _LIBCPP_ASSERT_NON_OVERLAPPING_RANGES(expression, message) _LIBCPP___CXX03_ASSUME(expression)
# define _LIBCPP_ASSERT_VALID_DEALLOCATION(expression, message) _LIBCPP___CXX03_ASSUME(expression)
# define _LIBCPP_ASSERT_VALID_EXTERNAL_API_CALL(expression, message) _LIBCPP___CXX03_ASSUME(expression)
# define _LIBCPP_ASSERT_COMPATIBLE_ALLOCATOR(expression, message) _LIBCPP___CXX03_ASSUME(expression)
# define _LIBCPP_ASSERT_ARGUMENT_WITHIN_DOMAIN(expression, message) _LIBCPP___CXX03_ASSUME(expression)
# define _LIBCPP_ASSERT_PEDANTIC(expression, message) _LIBCPP___CXX03_ASSUME(expression)
# define _LIBCPP_ASSERT_SEMANTIC_REQUIREMENT(expression, message) _LIBCPP___CXX03_ASSUME(expression)
# define _LIBCPP_ASSERT_INTERNAL(expression, message) _LIBCPP___CXX03_ASSUME(expression)
# define _LIBCPP_ASSERT_UNCATEGORIZED(expression, message) _LIBCPP___CXX03_ASSUME(expression)

#endif // _LIBCPP_HARDENING_MODE == _LIBCPP_HARDENING_MODE_FAST
// clang-format on

#endif // _LIBCPP___ASSERT
#endif // _LIBCPP___CXX03___ASSERT
12 changes: 6 additions & 6 deletions libcxx/include/__cxx03/__atomic/aliases.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___ATOMIC_ALIASES_H
#define _LIBCPP___ATOMIC_ALIASES_H
#ifndef _LIBCPP___CXX03___ATOMIC_ALIASES_H
#define _LIBCPP___CXX03___ATOMIC_ALIASES_H

#include <__cxx03/__atomic/atomic.h>
#include <__cxx03/__atomic/atomic_lock_free.h>
Expand Down Expand Up @@ -91,20 +91,20 @@ using __largest_lock_free_type = short;
# elif ATOMIC_CHAR_LOCK_FREE == 2
using __largest_lock_free_type = char;
# else
# define _LIBCPP_NO_LOCK_FREE_TYPES // There are no lockfree types (this can happen on unusual platforms)
# define _LIBCPP___CXX03_NO_LOCK_FREE_TYPES // There are no lockfree types (this can happen on unusual platforms)
# endif

# ifndef _LIBCPP_NO_LOCK_FREE_TYPES
# ifndef _LIBCPP___CXX03_NO_LOCK_FREE_TYPES
using __contention_t_or_largest =
__conditional_t<__libcpp_is_always_lock_free<__cxx_contention_t>::__value,
__cxx_contention_t,
__largest_lock_free_type>;

using atomic_signed_lock_free = atomic<__contention_t_or_largest>;
using atomic_unsigned_lock_free = atomic<make_unsigned_t<__contention_t_or_largest>>;
# endif // !_LIBCPP_NO_LOCK_FREE_TYPES
# endif // !_LIBCPP___CXX03_NO_LOCK_FREE_TYPES
#endif // C++20

_LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP___ATOMIC_ALIASES_H
#endif // _LIBCPP___CXX03___ATOMIC_ALIASES_H
26 changes: 13 additions & 13 deletions libcxx/include/__cxx03/__atomic/atomic.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___ATOMIC_ATOMIC_H
#define _LIBCPP___ATOMIC_ATOMIC_H
#ifndef _LIBCPP___CXX03___ATOMIC_ATOMIC_H
#define _LIBCPP___CXX03___ATOMIC_ATOMIC_H

#include <__cxx03/__atomic/atomic_base.h>
#include <__cxx03/__atomic/check_memory_order.h>
Expand Down Expand Up @@ -294,14 +294,14 @@ _LIBCPP_HIDE_FROM_ABI void atomic_store(atomic<_Tp>* __o, typename atomic<_Tp>::
template <class _Tp>
_LIBCPP_HIDE_FROM_ABI void
atomic_store_explicit(volatile atomic<_Tp>* __o, typename atomic<_Tp>::value_type __d, memory_order __m) _NOEXCEPT
_LIBCPP_CHECK_STORE_MEMORY_ORDER(__m) {
_LIBCPP___CXX03_CHECK_STORE_MEMORY_ORDER(__m) {
__o->store(__d, __m);
}

template <class _Tp>
_LIBCPP_HIDE_FROM_ABI void
atomic_store_explicit(atomic<_Tp>* __o, typename atomic<_Tp>::value_type __d, memory_order __m) _NOEXCEPT
_LIBCPP_CHECK_STORE_MEMORY_ORDER(__m) {
_LIBCPP___CXX03_CHECK_STORE_MEMORY_ORDER(__m) {
__o->store(__d, __m);
}

Expand All @@ -321,13 +321,13 @@ _LIBCPP_HIDE_FROM_ABI _Tp atomic_load(const atomic<_Tp>* __o) _NOEXCEPT {

template <class _Tp>
_LIBCPP_HIDE_FROM_ABI _Tp atomic_load_explicit(const volatile atomic<_Tp>* __o, memory_order __m) _NOEXCEPT
_LIBCPP_CHECK_LOAD_MEMORY_ORDER(__m) {
_LIBCPP___CXX03_CHECK_LOAD_MEMORY_ORDER(__m) {
return __o->load(__m);
}

template <class _Tp>
_LIBCPP_HIDE_FROM_ABI _Tp atomic_load_explicit(const atomic<_Tp>* __o, memory_order __m) _NOEXCEPT
_LIBCPP_CHECK_LOAD_MEMORY_ORDER(__m) {
_LIBCPP___CXX03_CHECK_LOAD_MEMORY_ORDER(__m) {
return __o->load(__m);
}

Expand Down Expand Up @@ -393,7 +393,7 @@ _LIBCPP_HIDE_FROM_ABI bool atomic_compare_exchange_weak_explicit(
typename atomic<_Tp>::value_type* __e,
typename atomic<_Tp>::value_type __d,
memory_order __s,
memory_order __f) _NOEXCEPT _LIBCPP_CHECK_EXCHANGE_MEMORY_ORDER(__s, __f) {
memory_order __f) _NOEXCEPT _LIBCPP___CXX03_CHECK_EXCHANGE_MEMORY_ORDER(__s, __f) {
return __o->compare_exchange_weak(*__e, __d, __s, __f);
}

Expand All @@ -403,7 +403,7 @@ _LIBCPP_HIDE_FROM_ABI bool atomic_compare_exchange_weak_explicit(
typename atomic<_Tp>::value_type* __e,
typename atomic<_Tp>::value_type __d,
memory_order __s,
memory_order __f) _NOEXCEPT _LIBCPP_CHECK_EXCHANGE_MEMORY_ORDER(__s, __f) {
memory_order __f) _NOEXCEPT _LIBCPP___CXX03_CHECK_EXCHANGE_MEMORY_ORDER(__s, __f) {
return __o->compare_exchange_weak(*__e, __d, __s, __f);
}

Expand All @@ -415,7 +415,7 @@ _LIBCPP_HIDE_FROM_ABI bool atomic_compare_exchange_strong_explicit(
typename atomic<_Tp>::value_type* __e,
typename atomic<_Tp>::value_type __d,
memory_order __s,
memory_order __f) _NOEXCEPT _LIBCPP_CHECK_EXCHANGE_MEMORY_ORDER(__s, __f) {
memory_order __f) _NOEXCEPT _LIBCPP___CXX03_CHECK_EXCHANGE_MEMORY_ORDER(__s, __f) {
return __o->compare_exchange_strong(*__e, __d, __s, __f);
}

Expand All @@ -425,7 +425,7 @@ _LIBCPP_HIDE_FROM_ABI bool atomic_compare_exchange_strong_explicit(
typename atomic<_Tp>::value_type* __e,
typename atomic<_Tp>::value_type __d,
memory_order __s,
memory_order __f) _NOEXCEPT _LIBCPP_CHECK_EXCHANGE_MEMORY_ORDER(__s, __f) {
memory_order __f) _NOEXCEPT _LIBCPP___CXX03_CHECK_EXCHANGE_MEMORY_ORDER(__s, __f) {
return __o->compare_exchange_strong(*__e, __d, __s, __f);
}

Expand All @@ -448,14 +448,14 @@ atomic_wait(const atomic<_Tp>* __o, typename atomic<_Tp>::value_type __v) _NOEXC
template <class _Tp>
_LIBCPP_AVAILABILITY_SYNC _LIBCPP_HIDE_FROM_ABI void
atomic_wait_explicit(const volatile atomic<_Tp>* __o, typename atomic<_Tp>::value_type __v, memory_order __m) _NOEXCEPT
_LIBCPP_CHECK_LOAD_MEMORY_ORDER(__m) {
_LIBCPP___CXX03_CHECK_LOAD_MEMORY_ORDER(__m) {
return __o->wait(__v, __m);
}

template <class _Tp>
_LIBCPP_AVAILABILITY_SYNC _LIBCPP_HIDE_FROM_ABI void
atomic_wait_explicit(const atomic<_Tp>* __o, typename atomic<_Tp>::value_type __v, memory_order __m) _NOEXCEPT
_LIBCPP_CHECK_LOAD_MEMORY_ORDER(__m) {
_LIBCPP___CXX03_CHECK_LOAD_MEMORY_ORDER(__m) {
return __o->wait(__v, __m);
}

Expand Down Expand Up @@ -619,4 +619,4 @@ atomic_fetch_xor_explicit(atomic<_Tp>* __o, typename atomic<_Tp>::value_type __o

_LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP___ATOMIC_ATOMIC_H
#endif // _LIBCPP___CXX03___ATOMIC_ATOMIC_H
22 changes: 11 additions & 11 deletions libcxx/include/__cxx03/__atomic/atomic_base.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___ATOMIC_ATOMIC_BASE_H
#define _LIBCPP___ATOMIC_ATOMIC_BASE_H
#ifndef _LIBCPP___CXX03___ATOMIC_ATOMIC_BASE_H
#define _LIBCPP___CXX03___ATOMIC_ATOMIC_BASE_H

#include <__cxx03/__atomic/atomic_sync.h>
#include <__cxx03/__atomic/check_memory_order.h>
Expand Down Expand Up @@ -43,19 +43,19 @@ struct __atomic_base // false
return static_cast<__atomic_base const volatile*>(this)->is_lock_free();
}
_LIBCPP_HIDE_FROM_ABI void store(_Tp __d, memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
_LIBCPP_CHECK_STORE_MEMORY_ORDER(__m) {
_LIBCPP___CXX03_CHECK_STORE_MEMORY_ORDER(__m) {
std::__cxx_atomic_store(std::addressof(__a_), __d, __m);
}
_LIBCPP_HIDE_FROM_ABI void store(_Tp __d, memory_order __m = memory_order_seq_cst) _NOEXCEPT
_LIBCPP_CHECK_STORE_MEMORY_ORDER(__m) {
_LIBCPP___CXX03_CHECK_STORE_MEMORY_ORDER(__m) {
std::__cxx_atomic_store(std::addressof(__a_), __d, __m);
}
_LIBCPP_HIDE_FROM_ABI _Tp load(memory_order __m = memory_order_seq_cst) const volatile _NOEXCEPT
_LIBCPP_CHECK_LOAD_MEMORY_ORDER(__m) {
_LIBCPP___CXX03_CHECK_LOAD_MEMORY_ORDER(__m) {
return std::__cxx_atomic_load(std::addressof(__a_), __m);
}
_LIBCPP_HIDE_FROM_ABI _Tp load(memory_order __m = memory_order_seq_cst) const _NOEXCEPT
_LIBCPP_CHECK_LOAD_MEMORY_ORDER(__m) {
_LIBCPP___CXX03_CHECK_LOAD_MEMORY_ORDER(__m) {
return std::__cxx_atomic_load(std::addressof(__a_), __m);
}
_LIBCPP_HIDE_FROM_ABI operator _Tp() const volatile _NOEXCEPT { return load(); }
Expand All @@ -68,20 +68,20 @@ struct __atomic_base // false
}
_LIBCPP_HIDE_FROM_ABI bool
compare_exchange_weak(_Tp& __e, _Tp __d, memory_order __s, memory_order __f) volatile _NOEXCEPT
_LIBCPP_CHECK_EXCHANGE_MEMORY_ORDER(__s, __f) {
_LIBCPP___CXX03_CHECK_EXCHANGE_MEMORY_ORDER(__s, __f) {
return std::__cxx_atomic_compare_exchange_weak(std::addressof(__a_), std::addressof(__e), __d, __s, __f);
}
_LIBCPP_HIDE_FROM_ABI bool compare_exchange_weak(_Tp& __e, _Tp __d, memory_order __s, memory_order __f) _NOEXCEPT
_LIBCPP_CHECK_EXCHANGE_MEMORY_ORDER(__s, __f) {
_LIBCPP___CXX03_CHECK_EXCHANGE_MEMORY_ORDER(__s, __f) {
return std::__cxx_atomic_compare_exchange_weak(std::addressof(__a_), std::addressof(__e), __d, __s, __f);
}
_LIBCPP_HIDE_FROM_ABI bool
compare_exchange_strong(_Tp& __e, _Tp __d, memory_order __s, memory_order __f) volatile _NOEXCEPT
_LIBCPP_CHECK_EXCHANGE_MEMORY_ORDER(__s, __f) {
_LIBCPP___CXX03_CHECK_EXCHANGE_MEMORY_ORDER(__s, __f) {
return std::__cxx_atomic_compare_exchange_strong(std::addressof(__a_), std::addressof(__e), __d, __s, __f);
}
_LIBCPP_HIDE_FROM_ABI bool compare_exchange_strong(_Tp& __e, _Tp __d, memory_order __s, memory_order __f) _NOEXCEPT
_LIBCPP_CHECK_EXCHANGE_MEMORY_ORDER(__s, __f) {
_LIBCPP___CXX03_CHECK_EXCHANGE_MEMORY_ORDER(__s, __f) {
return std::__cxx_atomic_compare_exchange_strong(std::addressof(__a_), std::addressof(__e), __d, __s, __f);
}
_LIBCPP_HIDE_FROM_ABI bool
Expand Down Expand Up @@ -218,4 +218,4 @@ struct __atomic_waitable_traits<__atomic_base<_Tp, _IsIntegral> > {

_LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP___ATOMIC_ATOMIC_BASE_H
#endif // _LIBCPP___CXX03___ATOMIC_ATOMIC_BASE_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__atomic/atomic_flag.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___ATOMIC_ATOMIC_FLAG_H
#define _LIBCPP___ATOMIC_ATOMIC_FLAG_H
#ifndef _LIBCPP___CXX03___ATOMIC_ATOMIC_FLAG_H
#define _LIBCPP___CXX03___ATOMIC_ATOMIC_FLAG_H

#include <__cxx03/__atomic/atomic_sync.h>
#include <__cxx03/__atomic/contention_t.h>
Expand Down Expand Up @@ -186,4 +186,4 @@ atomic_flag_notify_all(atomic_flag* __o) _NOEXCEPT {

_LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP___ATOMIC_ATOMIC_FLAG_H
#endif // _LIBCPP___CXX03___ATOMIC_ATOMIC_FLAG_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__atomic/atomic_init.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___ATOMIC_ATOMIC_INIT_H
#define _LIBCPP___ATOMIC_ATOMIC_INIT_H
#ifndef _LIBCPP___CXX03___ATOMIC_ATOMIC_INIT_H
#define _LIBCPP___CXX03___ATOMIC_ATOMIC_INIT_H

#include <__cxx03/__config>

Expand All @@ -22,4 +22,4 @@
# pragma clang deprecated(ATOMIC_VAR_INIT)
#endif

#endif // _LIBCPP___ATOMIC_ATOMIC_INIT_H
#endif // _LIBCPP___CXX03___ATOMIC_ATOMIC_INIT_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__atomic/atomic_lock_free.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___ATOMIC_ATOMIC_LOCK_FREE_H
#define _LIBCPP___ATOMIC_ATOMIC_LOCK_FREE_H
#ifndef _LIBCPP___CXX03___ATOMIC_ATOMIC_LOCK_FREE_H
#define _LIBCPP___CXX03___ATOMIC_ATOMIC_LOCK_FREE_H

#include <__cxx03/__config>

Expand Down Expand Up @@ -45,4 +45,4 @@
# define ATOMIC_POINTER_LOCK_FREE __GCC_ATOMIC_POINTER_LOCK_FREE
#endif

#endif // _LIBCPP___ATOMIC_ATOMIC_LOCK_FREE_H
#endif // _LIBCPP___CXX03___ATOMIC_ATOMIC_LOCK_FREE_H
16 changes: 8 additions & 8 deletions libcxx/include/__cxx03/__atomic/atomic_ref.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
//
//===---------------------------------------------------------------------===//

#ifndef _LIBCPP___ATOMIC_ATOMIC_REF_H
#define _LIBCPP___ATOMIC_ATOMIC_REF_H
#ifndef _LIBCPP___CXX03___ATOMIC_ATOMIC_REF_H
#define _LIBCPP___CXX03___ATOMIC_ATOMIC_REF_H

#include <__cxx03/__assert>
#include <__cxx03/__atomic/atomic_sync.h>
Expand Down Expand Up @@ -122,7 +122,7 @@ struct __atomic_ref_base {
_LIBCPP_HIDE_FROM_ABI bool is_lock_free() const noexcept { return __atomic_is_lock_free(sizeof(_Tp), __ptr_); }

_LIBCPP_HIDE_FROM_ABI void store(_Tp __desired, memory_order __order = memory_order::seq_cst) const noexcept
_LIBCPP_CHECK_STORE_MEMORY_ORDER(__order) {
_LIBCPP___CXX03_CHECK_STORE_MEMORY_ORDER(__order) {
_LIBCPP_ASSERT_ARGUMENT_WITHIN_DOMAIN(
__order == memory_order::relaxed || __order == memory_order::release || __order == memory_order::seq_cst,
"atomic_ref: memory order argument to atomic store operation is invalid");
Expand All @@ -135,7 +135,7 @@ struct __atomic_ref_base {
}

_LIBCPP_HIDE_FROM_ABI _Tp load(memory_order __order = memory_order::seq_cst) const noexcept
_LIBCPP_CHECK_LOAD_MEMORY_ORDER(__order) {
_LIBCPP___CXX03_CHECK_LOAD_MEMORY_ORDER(__order) {
_LIBCPP_ASSERT_ARGUMENT_WITHIN_DOMAIN(
__order == memory_order::relaxed || __order == memory_order::consume || __order == memory_order::acquire ||
__order == memory_order::seq_cst,
Expand All @@ -157,7 +157,7 @@ struct __atomic_ref_base {

_LIBCPP_HIDE_FROM_ABI bool
compare_exchange_weak(_Tp& __expected, _Tp __desired, memory_order __success, memory_order __failure) const noexcept
_LIBCPP_CHECK_EXCHANGE_MEMORY_ORDER(__success, __failure) {
_LIBCPP___CXX03_CHECK_EXCHANGE_MEMORY_ORDER(__success, __failure) {
_LIBCPP_ASSERT_ARGUMENT_WITHIN_DOMAIN(
__failure == memory_order::relaxed || __failure == memory_order::consume ||
__failure == memory_order::acquire || __failure == memory_order::seq_cst,
Expand All @@ -172,7 +172,7 @@ struct __atomic_ref_base {
}
_LIBCPP_HIDE_FROM_ABI bool
compare_exchange_strong(_Tp& __expected, _Tp __desired, memory_order __success, memory_order __failure) const noexcept
_LIBCPP_CHECK_EXCHANGE_MEMORY_ORDER(__success, __failure) {
_LIBCPP___CXX03_CHECK_EXCHANGE_MEMORY_ORDER(__success, __failure) {
_LIBCPP_ASSERT_ARGUMENT_WITHIN_DOMAIN(
__failure == memory_order::relaxed || __failure == memory_order::consume ||
__failure == memory_order::acquire || __failure == memory_order::seq_cst,
Expand Down Expand Up @@ -208,7 +208,7 @@ struct __atomic_ref_base {
}

_LIBCPP_HIDE_FROM_ABI void wait(_Tp __old, memory_order __order = memory_order::seq_cst) const noexcept
_LIBCPP_CHECK_WAIT_MEMORY_ORDER(__order) {
_LIBCPP___CXX03_CHECK_WAIT_MEMORY_ORDER(__order) {
_LIBCPP_ASSERT_ARGUMENT_WITHIN_DOMAIN(
__order == memory_order::relaxed || __order == memory_order::consume || __order == memory_order::acquire ||
__order == memory_order::seq_cst,
Expand Down Expand Up @@ -375,4 +375,4 @@ _LIBCPP_END_NAMESPACE_STD

_LIBCPP_POP_MACROS

#endif // _LIBCPP__ATOMIC_ATOMIC_REF_H
#endif // _LIBCPP___CXX03__ATOMIC_ATOMIC_REF_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__atomic/atomic_sync.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___ATOMIC_ATOMIC_SYNC_H
#define _LIBCPP___ATOMIC_ATOMIC_SYNC_H
#ifndef _LIBCPP___CXX03___ATOMIC_ATOMIC_SYNC_H
#define _LIBCPP___CXX03___ATOMIC_ATOMIC_SYNC_H

#include <__cxx03/__atomic/contention_t.h>
#include <__cxx03/__atomic/cxx_atomic_impl.h>
Expand Down Expand Up @@ -202,4 +202,4 @@ __atomic_wait(_AtomicWaitable& __a, _Up __val, memory_order __order) {

_LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP___ATOMIC_ATOMIC_SYNC_H
#endif // _LIBCPP___CXX03___ATOMIC_ATOMIC_SYNC_H
14 changes: 7 additions & 7 deletions libcxx/include/__cxx03/__atomic/check_memory_order.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,29 +6,29 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___ATOMIC_CHECK_MEMORY_ORDER_H
#define _LIBCPP___ATOMIC_CHECK_MEMORY_ORDER_H
#ifndef _LIBCPP___CXX03___ATOMIC_CHECK_MEMORY_ORDER_H
#define _LIBCPP___CXX03___ATOMIC_CHECK_MEMORY_ORDER_H

#include <__cxx03/__config>

#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
# pragma GCC system_header
#endif

#define _LIBCPP_CHECK_STORE_MEMORY_ORDER(__m) \
#define _LIBCPP___CXX03_CHECK_STORE_MEMORY_ORDER(__m) \
_LIBCPP_DIAGNOSE_WARNING(__m == memory_order_consume || __m == memory_order_acquire || __m == memory_order_acq_rel, \
"memory order argument to atomic operation is invalid")

#define _LIBCPP_CHECK_LOAD_MEMORY_ORDER(__m) \
#define _LIBCPP___CXX03_CHECK_LOAD_MEMORY_ORDER(__m) \
_LIBCPP_DIAGNOSE_WARNING(__m == memory_order_release || __m == memory_order_acq_rel, \
"memory order argument to atomic operation is invalid")

#define _LIBCPP_CHECK_EXCHANGE_MEMORY_ORDER(__m, __f) \
#define _LIBCPP___CXX03_CHECK_EXCHANGE_MEMORY_ORDER(__m, __f) \
_LIBCPP_DIAGNOSE_WARNING(__f == memory_order_release || __f == memory_order_acq_rel, \
"memory order argument to atomic operation is invalid")

#define _LIBCPP_CHECK_WAIT_MEMORY_ORDER(__m) \
#define _LIBCPP___CXX03_CHECK_WAIT_MEMORY_ORDER(__m) \
_LIBCPP_DIAGNOSE_WARNING(__m == memory_order_release || __m == memory_order_acq_rel, \
"memory order argument to atomic operation is invalid")

#endif // _LIBCPP___ATOMIC_CHECK_MEMORY_ORDER_H
#endif // _LIBCPP___CXX03___ATOMIC_CHECK_MEMORY_ORDER_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__atomic/contention_t.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___ATOMIC_CONTENTION_T_H
#define _LIBCPP___ATOMIC_CONTENTION_T_H
#ifndef _LIBCPP___CXX03___ATOMIC_CONTENTION_T_H
#define _LIBCPP___CXX03___ATOMIC_CONTENTION_T_H

#include <__cxx03/__atomic/cxx_atomic_impl.h>
#include <__cxx03/__config>
Expand All @@ -29,4 +29,4 @@ using __cxx_atomic_contention_t = __cxx_atomic_impl<__cxx_contention_t>;

_LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP___ATOMIC_CONTENTION_T_H
#endif // _LIBCPP___CXX03___ATOMIC_CONTENTION_T_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__atomic/cxx_atomic_impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___ATOMIC_CXX_ATOMIC_IMPL_H
#define _LIBCPP___ATOMIC_CXX_ATOMIC_IMPL_H
#ifndef _LIBCPP___CXX03___ATOMIC_CXX_ATOMIC_IMPL_H
#define _LIBCPP___CXX03___ATOMIC_CXX_ATOMIC_IMPL_H

#include <__cxx03/__atomic/memory_order.h>
#include <__cxx03/__atomic/to_gcc_order.h>
Expand Down Expand Up @@ -507,4 +507,4 @@ struct __cxx_atomic_impl : public _Base {

_LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP___ATOMIC_CXX_ATOMIC_IMPL_H
#endif // _LIBCPP___CXX03___ATOMIC_CXX_ATOMIC_IMPL_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__atomic/fence.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___ATOMIC_FENCE_H
#define _LIBCPP___ATOMIC_FENCE_H
#ifndef _LIBCPP___CXX03___ATOMIC_FENCE_H
#define _LIBCPP___CXX03___ATOMIC_FENCE_H

#include <__cxx03/__atomic/cxx_atomic_impl.h>
#include <__cxx03/__atomic/memory_order.h>
Expand All @@ -25,4 +25,4 @@ inline _LIBCPP_HIDE_FROM_ABI void atomic_signal_fence(memory_order __m) _NOEXCEP

_LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP___ATOMIC_FENCE_H
#endif // _LIBCPP___CXX03___ATOMIC_FENCE_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__atomic/is_always_lock_free.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___ATOMIC_IS_ALWAYS_LOCK_FREE_H
#define _LIBCPP___ATOMIC_IS_ALWAYS_LOCK_FREE_H
#ifndef _LIBCPP___CXX03___ATOMIC_IS_ALWAYS_LOCK_FREE_H
#define _LIBCPP___CXX03___ATOMIC_IS_ALWAYS_LOCK_FREE_H

#include <__cxx03/__config>

Expand All @@ -25,4 +25,4 @@ struct __libcpp_is_always_lock_free {

_LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP___ATOMIC_IS_ALWAYS_LOCK_FREE_H
#endif // _LIBCPP___CXX03___ATOMIC_IS_ALWAYS_LOCK_FREE_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__atomic/kill_dependency.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___ATOMIC_KILL_DEPENDENCY_H
#define _LIBCPP___ATOMIC_KILL_DEPENDENCY_H
#ifndef _LIBCPP___CXX03___ATOMIC_KILL_DEPENDENCY_H
#define _LIBCPP___CXX03___ATOMIC_KILL_DEPENDENCY_H

#include <__cxx03/__config>

Expand All @@ -24,4 +24,4 @@ _LIBCPP_HIDE_FROM_ABI _Tp kill_dependency(_Tp __y) _NOEXCEPT {

_LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP___ATOMIC_KILL_DEPENDENCY_H
#endif // _LIBCPP___CXX03___ATOMIC_KILL_DEPENDENCY_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__atomic/memory_order.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___ATOMIC_MEMORY_ORDER_H
#define _LIBCPP___ATOMIC_MEMORY_ORDER_H
#ifndef _LIBCPP___CXX03___ATOMIC_MEMORY_ORDER_H
#define _LIBCPP___CXX03___ATOMIC_MEMORY_ORDER_H

#include <__cxx03/__config>
#include <__cxx03/__type_traits/is_same.h>
Expand Down Expand Up @@ -62,4 +62,4 @@ enum memory_order {

_LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP___ATOMIC_MEMORY_ORDER_H
#endif // _LIBCPP___CXX03___ATOMIC_MEMORY_ORDER_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__atomic/to_gcc_order.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___ATOMIC_TO_GCC_ORDER_H
#define _LIBCPP___ATOMIC_TO_GCC_ORDER_H
#ifndef _LIBCPP___CXX03___ATOMIC_TO_GCC_ORDER_H
#define _LIBCPP___CXX03___ATOMIC_TO_GCC_ORDER_H

#include <__cxx03/__atomic/memory_order.h>
#include <__cxx03/__config>
Expand Down Expand Up @@ -51,4 +51,4 @@ _LIBCPP_HIDE_FROM_ABI inline _LIBCPP_CONSTEXPR int __to_gcc_failure_order(memory

_LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP___ATOMIC_TO_GCC_ORDER_H
#endif // _LIBCPP___CXX03___ATOMIC_TO_GCC_ORDER_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__bit/bit_cast.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___BIT_BIT_CAST_H
#define _LIBCPP___BIT_BIT_CAST_H
#ifndef _LIBCPP___CXX03___BIT_BIT_CAST_H
#define _LIBCPP___CXX03___BIT_BIT_CAST_H

#include <__cxx03/__config>
#include <__cxx03/__type_traits/is_trivially_copyable.h>
Expand Down Expand Up @@ -41,4 +41,4 @@ template <class _ToType, class _FromType>

_LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP___BIT_BIT_CAST_H
#endif // _LIBCPP___CXX03___BIT_BIT_CAST_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__bit/bit_ceil.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___BIT_BIT_CEIL_H
#define _LIBCPP___BIT_BIT_CEIL_H
#ifndef _LIBCPP___CXX03___BIT_BIT_CEIL_H
#define _LIBCPP___CXX03___BIT_BIT_CEIL_H

#include <__cxx03/__assert>
#include <__cxx03/__bit/countl.h>
Expand Down Expand Up @@ -51,4 +51,4 @@ template <__libcpp_unsigned_integer _Tp>

_LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP___BIT_BIT_CEIL_H
#endif // _LIBCPP___CXX03___BIT_BIT_CEIL_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__bit/bit_floor.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___BIT_BIT_FLOOR_H
#define _LIBCPP___BIT_BIT_FLOOR_H
#ifndef _LIBCPP___CXX03___BIT_BIT_FLOOR_H
#define _LIBCPP___CXX03___BIT_BIT_FLOOR_H

#include <__cxx03/__bit/bit_log2.h>
#include <__cxx03/__concepts/arithmetic.h>
Expand All @@ -31,4 +31,4 @@ template <__libcpp_unsigned_integer _Tp>

_LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP___BIT_BIT_FLOOR_H
#endif // _LIBCPP___CXX03___BIT_BIT_FLOOR_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__bit/bit_log2.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___BIT_BIT_LOG2_H
#define _LIBCPP___BIT_BIT_LOG2_H
#ifndef _LIBCPP___CXX03___BIT_BIT_LOG2_H
#define _LIBCPP___CXX03___BIT_BIT_LOG2_H

#include <__cxx03/__bit/countl.h>
#include <__cxx03/__concepts/arithmetic.h>
Expand All @@ -31,4 +31,4 @@ _LIBCPP_HIDE_FROM_ABI constexpr _Tp __bit_log2(_Tp __t) noexcept {

_LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP___BIT_BIT_LOG2_H
#endif // _LIBCPP___CXX03___BIT_BIT_LOG2_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__bit/bit_width.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___BIT_BIT_WIDTH_H
#define _LIBCPP___BIT_BIT_WIDTH_H
#ifndef _LIBCPP___CXX03___BIT_BIT_WIDTH_H
#define _LIBCPP___CXX03___BIT_BIT_WIDTH_H

#include <__cxx03/__bit/bit_log2.h>
#include <__cxx03/__concepts/arithmetic.h>
Expand All @@ -30,4 +30,4 @@ _LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP_STD_VER >= 20

#endif // _LIBCPP___BIT_BIT_WIDTH_H
#endif // _LIBCPP___CXX03___BIT_BIT_WIDTH_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__bit/blsr.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___BIT_BLSR_H
#define _LIBCPP___BIT_BLSR_H
#ifndef _LIBCPP___CXX03___BIT_BLSR_H
#define _LIBCPP___CXX03___BIT_BLSR_H

#include <__cxx03/__config>

Expand All @@ -31,4 +31,4 @@ inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR unsigned long long __libcpp_blsr(

_LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP___BIT_BLSR_H
#endif // _LIBCPP___CXX03___BIT_BLSR_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__bit/byteswap.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___BIT_BYTESWAP_H
#define _LIBCPP___BIT_BYTESWAP_H
#ifndef _LIBCPP___CXX03___BIT_BYTESWAP_H
#define _LIBCPP___CXX03___BIT_BYTESWAP_H

#include <__cxx03/__concepts/arithmetic.h>
#include <__cxx03/__config>
Expand Down Expand Up @@ -50,4 +50,4 @@ template <integral _Tp>

_LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP___BIT_BYTESWAP_H
#endif // _LIBCPP___CXX03___BIT_BYTESWAP_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__bit/countl.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
// TODO: __builtin_clzg is available since Clang 19 and GCC 14. When support for older versions is dropped, we can
// refactor this code to exclusively use __builtin_clzg.

#ifndef _LIBCPP___BIT_COUNTL_H
#define _LIBCPP___BIT_COUNTL_H
#ifndef _LIBCPP___CXX03___BIT_COUNTL_H
#define _LIBCPP___CXX03___BIT_COUNTL_H

#include <__cxx03/__bit/rotate.h>
#include <__cxx03/__concepts/arithmetic.h>
Expand Down Expand Up @@ -110,4 +110,4 @@ _LIBCPP_END_NAMESPACE_STD

_LIBCPP_POP_MACROS

#endif // _LIBCPP___BIT_COUNTL_H
#endif // _LIBCPP___CXX03___BIT_COUNTL_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__bit/countr.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
// TODO: __builtin_ctzg is available since Clang 19 and GCC 14. When support for older versions is dropped, we can
// refactor this code to exclusively use __builtin_ctzg.

#ifndef _LIBCPP___BIT_COUNTR_H
#define _LIBCPP___BIT_COUNTR_H
#ifndef _LIBCPP___CXX03___BIT_COUNTR_H
#define _LIBCPP___CXX03___BIT_COUNTR_H

#include <__cxx03/__bit/rotate.h>
#include <__cxx03/__concepts/arithmetic.h>
Expand Down Expand Up @@ -81,4 +81,4 @@ _LIBCPP_END_NAMESPACE_STD

_LIBCPP_POP_MACROS

#endif // _LIBCPP___BIT_COUNTR_H
#endif // _LIBCPP___CXX03___BIT_COUNTR_H
10 changes: 5 additions & 5 deletions libcxx/include/__cxx03/__bit/endian.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___BIT_ENDIAN_H
#define _LIBCPP___BIT_ENDIAN_H
#ifndef _LIBCPP___CXX03___BIT_ENDIAN_H
#define _LIBCPP___CXX03___BIT_ENDIAN_H

#include <__cxx03/__config>

Expand All @@ -22,9 +22,9 @@ _LIBCPP_BEGIN_NAMESPACE_STD
enum class endian {
little = 0xDEAD,
big = 0xFACE,
# if defined(_LIBCPP_LITTLE_ENDIAN)
# if defined(_LIBCPP___CXX03_LITTLE_ENDIAN)
native = little
# elif defined(_LIBCPP_BIG_ENDIAN)
# elif defined(_LIBCPP___CXX03_BIG_ENDIAN)
native = big
# else
native = 0xCAFE
Expand All @@ -35,4 +35,4 @@ _LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP_STD_VER >= 20

#endif // _LIBCPP___BIT_ENDIAN_H
#endif // _LIBCPP___CXX03___BIT_ENDIAN_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__bit/has_single_bit.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___BIT_HAS_SINGLE_BIT_H
#define _LIBCPP___BIT_HAS_SINGLE_BIT_H
#ifndef _LIBCPP___CXX03___BIT_HAS_SINGLE_BIT_H
#define _LIBCPP___CXX03___BIT_HAS_SINGLE_BIT_H

#include <__cxx03/__concepts/arithmetic.h>
#include <__cxx03/__config>
Expand All @@ -34,4 +34,4 @@ _LIBCPP_END_NAMESPACE_STD

_LIBCPP_POP_MACROS

#endif // _LIBCPP___BIT_HAS_SINGLE_BIT_H
#endif // _LIBCPP___CXX03___BIT_HAS_SINGLE_BIT_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__bit/invert_if.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___BIT_INVERT_IF_H
#define _LIBCPP___BIT_INVERT_IF_H
#ifndef _LIBCPP___CXX03___BIT_INVERT_IF_H
#define _LIBCPP___CXX03___BIT_INVERT_IF_H

#include <__cxx03/__concepts/arithmetic.h>
#include <__cxx03/__config>
Expand All @@ -27,4 +27,4 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 _Tp __invert_if(_Tp __v) {

_LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP___BIT_INVERT_IF_H
#endif // _LIBCPP___CXX03___BIT_INVERT_IF_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__bit/popcount.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
// TODO: __builtin_popcountg is available since Clang 19 and GCC 14. When support for older versions is dropped, we can
// refactor this code to exclusively use __builtin_popcountg.

#ifndef _LIBCPP___BIT_POPCOUNT_H
#define _LIBCPP___BIT_POPCOUNT_H
#ifndef _LIBCPP___CXX03___BIT_POPCOUNT_H
#define _LIBCPP___CXX03___BIT_POPCOUNT_H

#include <__cxx03/__bit/rotate.h>
#include <__cxx03/__concepts/arithmetic.h>
Expand Down Expand Up @@ -68,4 +68,4 @@ _LIBCPP_END_NAMESPACE_STD

_LIBCPP_POP_MACROS

#endif // _LIBCPP___BIT_POPCOUNT_H
#endif // _LIBCPP___CXX03___BIT_POPCOUNT_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__bit/rotate.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___BIT_ROTATE_H
#define _LIBCPP___BIT_ROTATE_H
#ifndef _LIBCPP___CXX03___BIT_ROTATE_H
#define _LIBCPP___CXX03___BIT_ROTATE_H

#include <__cxx03/__concepts/arithmetic.h>
#include <__cxx03/__config>
Expand Down Expand Up @@ -69,4 +69,4 @@ template <__libcpp_unsigned_integer _Tp>

_LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP___BIT_ROTATE_H
#endif // _LIBCPP___CXX03___BIT_ROTATE_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__bit_reference
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___BIT_REFERENCE
#define _LIBCPP___BIT_REFERENCE
#ifndef _LIBCPP___CXX03___BIT_REFERENCE
#define _LIBCPP___CXX03___BIT_REFERENCE

#include <__cxx03/__algorithm/copy_n.h>
#include <__cxx03/__algorithm/fill_n.h>
Expand Down Expand Up @@ -1021,4 +1021,4 @@ _LIBCPP_END_NAMESPACE_STD

_LIBCPP_POP_MACROS

#endif // _LIBCPP___BIT_REFERENCE
#endif // _LIBCPP___CXX03___BIT_REFERENCE
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__charconv/chars_format.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___CHARCONV_CHARS_FORMAT_H
#define _LIBCPP___CHARCONV_CHARS_FORMAT_H
#ifndef _LIBCPP___CXX03___CHARCONV_CHARS_FORMAT_H
#define _LIBCPP___CXX03___CHARCONV_CHARS_FORMAT_H

#include <__cxx03/__config>
#include <__cxx03/__utility/to_underlying.h>
Expand Down Expand Up @@ -58,4 +58,4 @@ inline _LIBCPP_HIDE_FROM_ABI constexpr chars_format& operator^=(chars_format& __

_LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP___CHARCONV_CHARS_FORMAT_H
#endif // _LIBCPP___CXX03___CHARCONV_CHARS_FORMAT_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__charconv/from_chars_integral.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___CHARCONV_FROM_CHARS_INTEGRAL_H
#define _LIBCPP___CHARCONV_FROM_CHARS_INTEGRAL_H
#ifndef _LIBCPP___CXX03___CHARCONV_FROM_CHARS_INTEGRAL_H
#define _LIBCPP___CXX03___CHARCONV_FROM_CHARS_INTEGRAL_H

#include <__cxx03/__algorithm/copy_n.h>
#include <__cxx03/__assert>
Expand Down Expand Up @@ -237,4 +237,4 @@ _LIBCPP_END_NAMESPACE_STD

_LIBCPP_POP_MACROS

#endif // _LIBCPP___CHARCONV_FROM_CHARS_INTEGRAL_H
#endif // _LIBCPP___CXX03___CHARCONV_FROM_CHARS_INTEGRAL_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__charconv/from_chars_result.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___CHARCONV_FROM_CHARS_RESULT_H
#define _LIBCPP___CHARCONV_FROM_CHARS_RESULT_H
#ifndef _LIBCPP___CXX03___CHARCONV_FROM_CHARS_RESULT_H
#define _LIBCPP___CXX03___CHARCONV_FROM_CHARS_RESULT_H

#include <__cxx03/__config>
#include <__cxx03/__system_error/errc.h>
Expand Down Expand Up @@ -36,4 +36,4 @@ struct _LIBCPP_EXPORTED_FROM_ABI from_chars_result {

_LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP___CHARCONV_FROM_CHARS_RESULT_H
#endif // _LIBCPP___CXX03___CHARCONV_FROM_CHARS_RESULT_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__charconv/tables.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___CHARCONV_TABLES
#define _LIBCPP___CHARCONV_TABLES
#ifndef _LIBCPP___CXX03___CHARCONV_TABLES
#define _LIBCPP___CXX03___CHARCONV_TABLES

#include <__cxx03/__config>
#include <__cxx03/cstdint>
Expand Down Expand Up @@ -160,4 +160,4 @@ inline constexpr char __digits_base_10[200] = {

_LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP___CHARCONV_TABLES
#endif // _LIBCPP___CXX03___CHARCONV_TABLES
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__charconv/to_chars.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___CHARCONV_TO_CHARS
#define _LIBCPP___CHARCONV_TO_CHARS
#ifndef _LIBCPP___CXX03___CHARCONV_TO_CHARS
#define _LIBCPP___CXX03___CHARCONV_TO_CHARS

#include <__cxx03/__charconv/to_chars_floating_point.h>
#include <__cxx03/__charconv/to_chars_integral.h>
Expand All @@ -22,4 +22,4 @@ _LIBCPP_BEGIN_NAMESPACE_STD

_LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP___CHARCONV_TO_CHARS
#endif // _LIBCPP___CXX03___CHARCONV_TO_CHARS
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__charconv/to_chars_base_10.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___CHARCONV_TO_CHARS_BASE_10_H
#define _LIBCPP___CHARCONV_TO_CHARS_BASE_10_H
#ifndef _LIBCPP___CXX03___CHARCONV_TO_CHARS_BASE_10_H
#define _LIBCPP___CXX03___CHARCONV_TO_CHARS_BASE_10_H

#include <__cxx03/__algorithm/copy_n.h>
#include <__cxx03/__assert>
Expand Down Expand Up @@ -185,4 +185,4 @@ _LIBCPP_END_NAMESPACE_STD

_LIBCPP_POP_MACROS

#endif // _LIBCPP___CHARCONV_TO_CHARS_BASE_10_H
#endif // _LIBCPP___CXX03___CHARCONV_TO_CHARS_BASE_10_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__charconv/to_chars_floating_point.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___CHARCONV_TO_CHARS_FLOATING_POINT_H
#define _LIBCPP___CHARCONV_TO_CHARS_FLOATING_POINT_H
#ifndef _LIBCPP___CXX03___CHARCONV_TO_CHARS_FLOATING_POINT_H
#define _LIBCPP___CXX03___CHARCONV_TO_CHARS_FLOATING_POINT_H

#include <__cxx03/__charconv/chars_format.h>
#include <__cxx03/__charconv/to_chars_result.h>
Expand Down Expand Up @@ -52,4 +52,4 @@ to_chars(char* __first, char* __last, long double __value, chars_format __fmt, i

_LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP___CHARCONV_TO_CHARS_FLOATING_POINT_H
#endif // _LIBCPP___CXX03___CHARCONV_TO_CHARS_FLOATING_POINT_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__charconv/to_chars_integral.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___CHARCONV_TO_CHARS_INTEGRAL_H
#define _LIBCPP___CHARCONV_TO_CHARS_INTEGRAL_H
#ifndef _LIBCPP___CXX03___CHARCONV_TO_CHARS_INTEGRAL_H
#define _LIBCPP___CXX03___CHARCONV_TO_CHARS_INTEGRAL_H

#include <__cxx03/__algorithm/copy_n.h>
#include <__cxx03/__assert>
Expand Down Expand Up @@ -324,4 +324,4 @@ _LIBCPP_END_NAMESPACE_STD

_LIBCPP_POP_MACROS

#endif // _LIBCPP___CHARCONV_TO_CHARS_INTEGRAL_H
#endif // _LIBCPP___CXX03___CHARCONV_TO_CHARS_INTEGRAL_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__charconv/to_chars_result.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___CHARCONV_TO_CHARS_RESULT_H
#define _LIBCPP___CHARCONV_TO_CHARS_RESULT_H
#ifndef _LIBCPP___CXX03___CHARCONV_TO_CHARS_RESULT_H
#define _LIBCPP___CXX03___CHARCONV_TO_CHARS_RESULT_H

#include <__cxx03/__config>
#include <__cxx03/__system_error/errc.h>
Expand Down Expand Up @@ -36,4 +36,4 @@ struct _LIBCPP_EXPORTED_FROM_ABI to_chars_result {

_LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP___CHARCONV_TO_CHARS_RESULT_H
#endif // _LIBCPP___CXX03___CHARCONV_TO_CHARS_RESULT_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__charconv/traits.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___CHARCONV_TRAITS
#define _LIBCPP___CHARCONV_TRAITS
#ifndef _LIBCPP___CXX03___CHARCONV_TRAITS
#define _LIBCPP___CXX03___CHARCONV_TRAITS

#include <__cxx03/__assert>
#include <__cxx03/__bit/countl.h>
Expand Down Expand Up @@ -197,4 +197,4 @@ _LIBCPP_END_NAMESPACE_STD

_LIBCPP_POP_MACROS

#endif // _LIBCPP___CHARCONV_TRAITS
#endif // _LIBCPP___CXX03___CHARCONV_TRAITS
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__chrono/calendar.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___CHRONO_CALENDAR_H
#define _LIBCPP___CHRONO_CALENDAR_H
#ifndef _LIBCPP___CXX03___CHRONO_CALENDAR_H
#define _LIBCPP___CXX03___CHRONO_CALENDAR_H

#include <__cxx03/__chrono/duration.h>
#include <__cxx03/__chrono/time_point.h>
Expand Down Expand Up @@ -41,4 +41,4 @@ _LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP_STD_VER >= 20

#endif // _LIBCPP___CHRONO_CALENDAR_H
#endif // _LIBCPP___CXX03___CHRONO_CALENDAR_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__chrono/concepts.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___CHRONO_CONCEPTS_H
#define _LIBCPP___CHRONO_CONCEPTS_H
#ifndef _LIBCPP___CXX03___CHRONO_CONCEPTS_H
#define _LIBCPP___CXX03___CHRONO_CONCEPTS_H

#include <__cxx03/__chrono/hh_mm_ss.h>
#include <__cxx03/__chrono/time_point.h>
Expand All @@ -33,4 +33,4 @@ concept __is_time_point = __is_specialization_v<_Tp, chrono::time_point>;

_LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP___CHRONO_CONCEPTS_H
#endif // _LIBCPP___CXX03___CHRONO_CONCEPTS_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__chrono/convert_to_timespec.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___CHRONO_CONVERT_TO_TIMESPEC_H
#define _LIBCPP___CHRONO_CONVERT_TO_TIMESPEC_H
#ifndef _LIBCPP___CXX03___CHRONO_CONVERT_TO_TIMESPEC_H
#define _LIBCPP___CXX03___CHRONO_CONVERT_TO_TIMESPEC_H

#include <__cxx03/__chrono/duration.h>
#include <__cxx03/__config>
Expand Down Expand Up @@ -48,4 +48,4 @@ _LIBCPP_END_NAMESPACE_STD

_LIBCPP_POP_MACROS

#endif // _LIBCPP___CHRONO_CONVERT_TO_TIMESPEC_H
#endif // _LIBCPP___CXX03___CHRONO_CONVERT_TO_TIMESPEC_H
10 changes: 5 additions & 5 deletions libcxx/include/__cxx03/__chrono/convert_to_tm.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___CHRONO_CONVERT_TO_TM_H
#define _LIBCPP___CHRONO_CONVERT_TO_TM_H
#ifndef _LIBCPP___CXX03___CHRONO_CONVERT_TO_TM_H
#define _LIBCPP___CXX03___CHRONO_CONVERT_TO_TM_H

#include <__cxx03/__chrono/calendar.h>
#include <__cxx03/__chrono/concepts.h>
Expand Down Expand Up @@ -180,8 +180,8 @@ _LIBCPP_HIDE_FROM_ABI _Tm __convert_to_tm(const _ChronoT& __value) {
// Has no time information.
} else if constexpr (same_as<_ChronoT, chrono::local_info>) {
// Has no time information.
# if !defined(_LIBCPP_HAS_NO_TIME_ZONE_DATABASE) && !defined(_LIBCPP_HAS_NO_FILESYSTEM) && \
!defined(_LIBCPP_HAS_NO_LOCALIZATION)
# if !defined(_LIBCPP___CXX03_HAS_NO_TIME_ZONE_DATABASE) && !defined(_LIBCPP___CXX03_HAS_NO_FILESYSTEM) && \
!defined(_LIBCPP___CXX03_HAS_NO_LOCALIZATION)
} else if constexpr (__is_specialization_v<_ChronoT, chrono::zoned_time>) {
return std::__convert_to_tm<_Tm>(
chrono::sys_time<typename _ChronoT::duration>{__value.get_local_time().time_since_epoch()});
Expand All @@ -199,4 +199,4 @@ _LIBCPP_END_NAMESPACE_STD

_LIBCPP_POP_MACROS

#endif // _LIBCPP___CHRONO_CONVERT_TO_TM_H
#endif // _LIBCPP___CXX03___CHRONO_CONVERT_TO_TM_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__chrono/day.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___CHRONO_DAY_H
#define _LIBCPP___CHRONO_DAY_H
#ifndef _LIBCPP___CXX03___CHRONO_DAY_H
#define _LIBCPP___CXX03___CHRONO_DAY_H

#include <__cxx03/__chrono/duration.h>
#include <__cxx03/__config>
Expand Down Expand Up @@ -96,4 +96,4 @@ _LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP_STD_VER >= 20

#endif // _LIBCPP___CHRONO_DAY_H
#endif // _LIBCPP___CXX03___CHRONO_DAY_H
8 changes: 4 additions & 4 deletions libcxx/include/__cxx03/__chrono/duration.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___CHRONO_DURATION_H
#define _LIBCPP___CHRONO_DURATION_H
#ifndef _LIBCPP___CXX03___CHRONO_DURATION_H
#define _LIBCPP___CXX03___CHRONO_DURATION_H

#include <__cxx03/__compare/ordering.h>
#include <__cxx03/__compare/three_way_comparable.h>
Expand Down Expand Up @@ -543,8 +543,8 @@ _LIBCPP_END_NAMESPACE_STD

_LIBCPP_POP_MACROS

#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
#if !defined(_LIBCPP___CXX03_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
# include <__cxx03/type_traits>
#endif

#endif // _LIBCPP___CHRONO_DURATION_H
#endif // _LIBCPP___CXX03___CHRONO_DURATION_H
10 changes: 5 additions & 5 deletions libcxx/include/__cxx03/__chrono/exception.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

// For information see https://libcxx.llvm.org/DesignDocs/TimeZone.html

#ifndef _LIBCPP___CHRONO_EXCEPTION_H
#define _LIBCPP___CHRONO_EXCEPTION_H
#ifndef _LIBCPP___CXX03___CHRONO_EXCEPTION_H
#define _LIBCPP___CXX03___CHRONO_EXCEPTION_H

#include <__cxx03/version>
// Enable the contents of the header only when libc++ was built with experimental features enabled.
Expand Down Expand Up @@ -76,7 +76,7 @@ _LIBCPP_NORETURN _LIBCPP_AVAILABILITY_TZDB _LIBCPP_HIDE_FROM_ABI void __throw_no
# ifndef _LIBCPP_HAS_NO_EXCEPTIONS
throw nonexistent_local_time(__time, __info);
# else
_LIBCPP_VERBOSE_ABORT("nonexistent_local_time was thrown in -fno-exceptions mode");
_LIBCPP___CXX03_VERBOSE_ABORT("nonexistent_local_time was thrown in -fno-exceptions mode");
# endif
}

Expand Down Expand Up @@ -120,7 +120,7 @@ _LIBCPP_NORETURN _LIBCPP_AVAILABILITY_TZDB _LIBCPP_HIDE_FROM_ABI void __throw_am
# ifndef _LIBCPP_HAS_NO_EXCEPTIONS
throw ambiguous_local_time(__time, __info);
# else
_LIBCPP_VERBOSE_ABORT("ambiguous_local_time was thrown in -fno-exceptions mode");
_LIBCPP___CXX03_VERBOSE_ABORT("ambiguous_local_time was thrown in -fno-exceptions mode");
# endif
}

Expand All @@ -132,4 +132,4 @@ _LIBCPP_END_NAMESPACE_STD

#endif // !defined(_LIBCPP_HAS_NO_EXPERIMENTAL_TZDB)

#endif // _LIBCPP___CHRONO_EXCEPTION_H
#endif // _LIBCPP___CXX03___CHRONO_EXCEPTION_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__chrono/file_clock.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___CHRONO_FILE_CLOCK_H
#define _LIBCPP___CHRONO_FILE_CLOCK_H
#ifndef _LIBCPP___CXX03___CHRONO_FILE_CLOCK_H
#define _LIBCPP___CXX03___CHRONO_FILE_CLOCK_H

#include <__cxx03/__chrono/duration.h>
#include <__cxx03/__chrono/system_clock.h>
Expand Down Expand Up @@ -77,4 +77,4 @@ struct _FilesystemClock {
_LIBCPP_END_NAMESPACE_FILESYSTEM
#endif // !_LIBCPP_CXX03_LANG

#endif // _LIBCPP___CHRONO_FILE_CLOCK_H
#endif // _LIBCPP___CXX03___CHRONO_FILE_CLOCK_H
64 changes: 32 additions & 32 deletions libcxx/include/__cxx03/__chrono/formatter.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___CHRONO_FORMATTER_H
#define _LIBCPP___CHRONO_FORMATTER_H
#ifndef _LIBCPP___CXX03___CHRONO_FORMATTER_H
#define _LIBCPP___CXX03___CHRONO_FORMATTER_H

#include <__cxx03/__algorithm/ranges_copy.h>
#include <__cxx03/__chrono/calendar.h>
Expand Down Expand Up @@ -108,12 +108,12 @@ __format_sub_seconds(basic_stringstream<_CharT>& __sstr, const chrono::duration<
// differently and uses 3 decimals.
// https://godbolt.org/z/6dsbnW8ba
std::format_to(std::ostreambuf_iterator<_CharT>{__sstr},
_LIBCPP_STATICALLY_WIDEN(_CharT, "{:0{}.0f}"),
_LIBCPP___CXX03_STATICALLY_WIDEN(_CharT, "{:0{}.0f}"),
chrono::duration_cast<typename chrono::hh_mm_ss<__duration>::precision>(__fraction).count(),
chrono::hh_mm_ss<__duration>::fractional_width);
else
std::format_to(std::ostreambuf_iterator<_CharT>{__sstr},
_LIBCPP_STATICALLY_WIDEN(_CharT, "{:0{}}"),
_LIBCPP___CXX03_STATICALLY_WIDEN(_CharT, "{:0{}}"),
chrono::duration_cast<typename chrono::hh_mm_ss<__duration>::precision>(__fraction).count(),
chrono::hh_mm_ss<__duration>::fractional_width);
}
Expand All @@ -129,18 +129,18 @@ __format_sub_seconds(basic_stringstream<_CharT>& __sstr, const chrono::hh_mm_ss<
__sstr << std::use_facet<numpunct<_CharT>>(__sstr.getloc()).decimal_point();
if constexpr (chrono::treat_as_floating_point_v<typename _Duration::rep>)
std::format_to(std::ostreambuf_iterator<_CharT>{__sstr},
_LIBCPP_STATICALLY_WIDEN(_CharT, "{:0{}.0f}"),
_LIBCPP___CXX03_STATICALLY_WIDEN(_CharT, "{:0{}.0f}"),
__value.subseconds().count(),
__value.fractional_width);
else
std::format_to(std::ostreambuf_iterator<_CharT>{__sstr},
_LIBCPP_STATICALLY_WIDEN(_CharT, "{:0{}}"),
_LIBCPP___CXX03_STATICALLY_WIDEN(_CharT, "{:0{}}"),
__value.subseconds().count(),
__value.fractional_width);
}

# if !defined(_LIBCPP_HAS_NO_EXPERIMENTAL_TZDB) && !defined(_LIBCPP_HAS_NO_TIME_ZONE_DATABASE) && \
!defined(_LIBCPP_HAS_NO_FILESYSTEM) && !defined(_LIBCPP_HAS_NO_LOCALIZATION)
# if !defined(_LIBCPP_HAS_NO_EXPERIMENTAL_TZDB) && !defined(_LIBCPP___CXX03_HAS_NO_TIME_ZONE_DATABASE) && \
!defined(_LIBCPP___CXX03_HAS_NO_FILESYSTEM) && !defined(_LIBCPP___CXX03_HAS_NO_LOCALIZATION)
template <class _CharT, class _Duration, class _TimeZonePtr>
_LIBCPP_HIDE_FROM_ABI void
__format_sub_seconds(basic_stringstream<_CharT>& __sstr, const chrono::zoned_time<_Duration, _TimeZonePtr>& __value) {
Expand All @@ -152,8 +152,8 @@ template <class _Tp>
consteval bool __use_fraction() {
if constexpr (__is_time_point<_Tp>)
return chrono::hh_mm_ss<typename _Tp::duration>::fractional_width;
# if !defined(_LIBCPP_HAS_NO_EXPERIMENTAL_TZDB) && !defined(_LIBCPP_HAS_NO_TIME_ZONE_DATABASE) && \
!defined(_LIBCPP_HAS_NO_FILESYSTEM) && !defined(_LIBCPP_HAS_NO_LOCALIZATION)
# if !defined(_LIBCPP_HAS_NO_EXPERIMENTAL_TZDB) && !defined(_LIBCPP___CXX03_HAS_NO_TIME_ZONE_DATABASE) && \
!defined(_LIBCPP___CXX03_HAS_NO_FILESYSTEM) && !defined(_LIBCPP___CXX03_HAS_NO_LOCALIZATION)
else if constexpr (__is_specialization_v<_Tp, chrono::zoned_time>)
return chrono::hh_mm_ss<typename _Tp::duration>::fractional_width;
# endif
Expand All @@ -178,7 +178,7 @@ _LIBCPP_HIDE_FROM_ABI void __format_year(basic_stringstream<_CharT>& __sstr, int
// left-padded -> zero-padded, otherwise the proper value would be 000-0.

// Note according to the wording it should be left padded, which is odd.
__sstr << std::format(_LIBCPP_STATICALLY_WIDEN(_CharT, "{:04}"), __year);
__sstr << std::format(_LIBCPP___CXX03_STATICALLY_WIDEN(_CharT, "{:04}"), __year);
}

template <class _CharT>
Expand All @@ -190,7 +190,7 @@ _LIBCPP_HIDE_FROM_ABI void __format_century(basic_stringstream<_CharT>& __sstr,

bool __negative = __year < 0;
int __century = (__year - (99 * __negative)) / 100; // floored division
__sstr << std::format(_LIBCPP_STATICALLY_WIDEN(_CharT, "{:02}"), __century);
__sstr << std::format(_LIBCPP___CXX03_STATICALLY_WIDEN(_CharT, "{:02}"), __century);
}

// Implements the %z format specifier according to [tab:time.format.spec], where
Expand All @@ -209,10 +209,10 @@ __format_zone_offset(basic_stringstream<_CharT>& __sstr, chrono::seconds __offse
chrono::hh_mm_ss __hms{__offset};
std::ostreambuf_iterator<_CharT> __out_it{__sstr};
// Note HMS does not allow formatting hours > 23, but the offset is not limited to 24H.
std::format_to(__out_it, _LIBCPP_STATICALLY_WIDEN(_CharT, "{:02}"), __hms.hours().count());
std::format_to(__out_it, _LIBCPP___CXX03_STATICALLY_WIDEN(_CharT, "{:02}"), __hms.hours().count());
if (__modifier)
__sstr << _CharT(':');
std::format_to(__out_it, _LIBCPP_STATICALLY_WIDEN(_CharT, "{:02}"), __hms.minutes().count());
std::format_to(__out_it, _LIBCPP___CXX03_STATICALLY_WIDEN(_CharT, "{:02}"), __hms.minutes().count());
}

// Helper to store the time zone information needed for formatting.
Expand All @@ -228,8 +228,8 @@ _LIBCPP_HIDE_FROM_ABI __time_zone __convert_to_time_zone([[maybe_unused]] const
# if !defined(_LIBCPP_HAS_NO_EXPERIMENTAL_TZDB)
if constexpr (same_as<_Tp, chrono::sys_info>)
return {__value.abbrev, __value.offset};
# if !defined(_LIBCPP_HAS_NO_TIME_ZONE_DATABASE) && !defined(_LIBCPP_HAS_NO_FILESYSTEM) && \
!defined(_LIBCPP_HAS_NO_LOCALIZATION)
# if !defined(_LIBCPP___CXX03_HAS_NO_TIME_ZONE_DATABASE) && !defined(_LIBCPP___CXX03_HAS_NO_FILESYSTEM) && \
!defined(_LIBCPP___CXX03_HAS_NO_LOCALIZATION)
else if constexpr (__is_specialization_v<_Tp, chrono::zoned_time>)
return __formatter::__convert_to_time_zone(__value.get_info());
# endif
Expand Down Expand Up @@ -301,7 +301,7 @@ _LIBCPP_HIDE_FROM_ABI void __format_chrono_using_chrono_specs(
// FMT honours precision and has a bug for separator
// https://godbolt.org/z/78b7sMxns
if constexpr (chrono::__is_duration<_Tp>::value) {
__sstr << std::format(_LIBCPP_STATICALLY_WIDEN(_CharT, "{}"), __value.count());
__sstr << std::format(_LIBCPP___CXX03_STATICALLY_WIDEN(_CharT, "{}"), __value.count());
break;
}
__builtin_unreachable();
Expand Down Expand Up @@ -344,7 +344,7 @@ _LIBCPP_HIDE_FROM_ABI void __format_chrono_using_chrono_specs(
# if defined(__GLIBC__) || defined(_AIX) || defined(_WIN32)
case _CharT('y'):
// Glibc fails for negative values, AIX for positive values too.
__sstr << std::format(_LIBCPP_STATICALLY_WIDEN(_CharT, "{:02}"), (std::abs(__t.tm_year + 1900)) % 100);
__sstr << std::format(_LIBCPP___CXX03_STATICALLY_WIDEN(_CharT, "{:02}"), (std::abs(__t.tm_year + 1900)) % 100);
break;
# endif // defined(__GLIBC__) || defined(_AIX) || defined(_WIN32)

Expand All @@ -360,7 +360,7 @@ _LIBCPP_HIDE_FROM_ABI void __format_chrono_using_chrono_specs(
// limited. Instead of testing all conditions use the internal
// implementation unconditionally.
__formatter::__format_year(__sstr, __t.tm_year + 1900);
__sstr << std::format(_LIBCPP_STATICALLY_WIDEN(_CharT, "-{:02}-{:02}"), __t.tm_mon + 1, __t.tm_mday);
__sstr << std::format(_LIBCPP___CXX03_STATICALLY_WIDEN(_CharT, "-{:02}-{:02}"), __t.tm_mon + 1, __t.tm_mday);
break;

case _CharT('z'):
Expand Down Expand Up @@ -447,8 +447,8 @@ _LIBCPP_HIDE_FROM_ABI constexpr bool __weekday_ok(const _Tp& __value) {
return true;
else if constexpr (same_as<_Tp, chrono::local_info>)
return true;
# if !defined(_LIBCPP_HAS_NO_TIME_ZONE_DATABASE) && !defined(_LIBCPP_HAS_NO_FILESYSTEM) && \
!defined(_LIBCPP_HAS_NO_LOCALIZATION)
# if !defined(_LIBCPP___CXX03_HAS_NO_TIME_ZONE_DATABASE) && !defined(_LIBCPP___CXX03_HAS_NO_FILESYSTEM) && \
!defined(_LIBCPP___CXX03_HAS_NO_LOCALIZATION)
else if constexpr (__is_specialization_v<_Tp, chrono::zoned_time>)
return true;
# endif
Expand Down Expand Up @@ -498,8 +498,8 @@ _LIBCPP_HIDE_FROM_ABI constexpr bool __weekday_name_ok(const _Tp& __value) {
return true;
else if constexpr (same_as<_Tp, chrono::local_info>)
return true;
# if !defined(_LIBCPP_HAS_NO_TIME_ZONE_DATABASE) && !defined(_LIBCPP_HAS_NO_FILESYSTEM) && \
!defined(_LIBCPP_HAS_NO_LOCALIZATION)
# if !defined(_LIBCPP___CXX03_HAS_NO_TIME_ZONE_DATABASE) && !defined(_LIBCPP___CXX03_HAS_NO_FILESYSTEM) && \
!defined(_LIBCPP___CXX03_HAS_NO_LOCALIZATION)
else if constexpr (__is_specialization_v<_Tp, chrono::zoned_time>)
return true;
# endif
Expand Down Expand Up @@ -549,8 +549,8 @@ _LIBCPP_HIDE_FROM_ABI constexpr bool __date_ok(const _Tp& __value) {
return true;
else if constexpr (same_as<_Tp, chrono::local_info>)
return true;
# if !defined(_LIBCPP_HAS_NO_TIME_ZONE_DATABASE) && !defined(_LIBCPP_HAS_NO_FILESYSTEM) && \
!defined(_LIBCPP_HAS_NO_LOCALIZATION)
# if !defined(_LIBCPP___CXX03_HAS_NO_TIME_ZONE_DATABASE) && !defined(_LIBCPP___CXX03_HAS_NO_FILESYSTEM) && \
!defined(_LIBCPP___CXX03_HAS_NO_LOCALIZATION)
else if constexpr (__is_specialization_v<_Tp, chrono::zoned_time>)
return true;
# endif
Expand Down Expand Up @@ -600,8 +600,8 @@ _LIBCPP_HIDE_FROM_ABI constexpr bool __month_name_ok(const _Tp& __value) {
return true;
else if constexpr (same_as<_Tp, chrono::local_info>)
return true;
# if !defined(_LIBCPP_HAS_NO_TIME_ZONE_DATABASE) && !defined(_LIBCPP_HAS_NO_FILESYSTEM) && \
!defined(_LIBCPP_HAS_NO_LOCALIZATION)
# if !defined(_LIBCPP___CXX03_HAS_NO_TIME_ZONE_DATABASE) && !defined(_LIBCPP___CXX03_HAS_NO_FILESYSTEM) && \
!defined(_LIBCPP___CXX03_HAS_NO_LOCALIZATION)
else if constexpr (__is_specialization_v<_Tp, chrono::zoned_time>)
return true;
# endif
Expand Down Expand Up @@ -965,8 +965,8 @@ struct formatter<chrono::local_info, _CharT> : public __formatter_chrono<_CharT>
return _Base::__parse(__ctx, __format_spec::__fields_chrono, __format_spec::__flags{});
}
};
# if !defined(_LIBCPP_HAS_NO_TIME_ZONE_DATABASE) && !defined(_LIBCPP_HAS_NO_FILESYSTEM) && \
!defined(_LIBCPP_HAS_NO_LOCALIZATION)
# if !defined(_LIBCPP___CXX03_HAS_NO_TIME_ZONE_DATABASE) && !defined(_LIBCPP___CXX03_HAS_NO_FILESYSTEM) && \
!defined(_LIBCPP___CXX03_HAS_NO_LOCALIZATION)
// Note due to how libc++'s formatters are implemented there is no need to add
// the exposition only local-time-format-t abstraction.
template <class _Duration, class _TimeZonePtr, __fmt_char_type _CharT>
Expand All @@ -979,12 +979,12 @@ struct formatter<chrono::zoned_time<_Duration, _TimeZonePtr>, _CharT> : public _
return _Base::__parse(__ctx, __format_spec::__fields_chrono, __format_spec::__flags::__clock);
}
};
# endif // !defined(_LIBCPP_HAS_NO_TIME_ZONE_DATABASE) && !defined(_LIBCPP_HAS_NO_FILESYSTEM) &&
// !defined(_LIBCPP_HAS_NO_LOCALIZATION)
# endif // !defined(_LIBCPP___CXX03_HAS_NO_TIME_ZONE_DATABASE) && !defined(_LIBCPP___CXX03_HAS_NO_FILESYSTEM) &&
// !defined(_LIBCPP___CXX03_HAS_NO_LOCALIZATION)
# endif // !defined(_LIBCPP_HAS_NO_EXPERIMENTAL_TZDB)

#endif // if _LIBCPP_STD_VER >= 20

_LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP___CHRONO_FORMATTER_H
#endif // _LIBCPP___CXX03___CHRONO_FORMATTER_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__chrono/hh_mm_ss.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___CHRONO_HH_MM_SS_H
#define _LIBCPP___CHRONO_HH_MM_SS_H
#ifndef _LIBCPP___CXX03___CHRONO_HH_MM_SS_H
#define _LIBCPP___CXX03___CHRONO_HH_MM_SS_H

#include <__cxx03/__chrono/duration.h>
#include <__cxx03/__chrono/time_point.h>
Expand Down Expand Up @@ -109,4 +109,4 @@ _LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP_STD_VER >= 20

#endif // _LIBCPP___CHRONO_HH_MM_SS_H
#endif // _LIBCPP___CXX03___CHRONO_HH_MM_SS_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__chrono/high_resolution_clock.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___CHRONO_HIGH_RESOLUTION_CLOCK_H
#define _LIBCPP___CHRONO_HIGH_RESOLUTION_CLOCK_H
#ifndef _LIBCPP___CXX03___CHRONO_HIGH_RESOLUTION_CLOCK_H
#define _LIBCPP___CXX03___CHRONO_HIGH_RESOLUTION_CLOCK_H

#include <__cxx03/__chrono/steady_clock.h>
#include <__cxx03/__chrono/system_clock.h>
Expand All @@ -32,4 +32,4 @@ typedef system_clock high_resolution_clock;

_LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP___CHRONO_HIGH_RESOLUTION_CLOCK_H
#endif // _LIBCPP___CXX03___CHRONO_HIGH_RESOLUTION_CLOCK_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__chrono/leap_second.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

// For information see https://libcxx.llvm.org/DesignDocs/TimeZone.html

#ifndef _LIBCPP___CHRONO_LEAP_SECOND_H
#define _LIBCPP___CHRONO_LEAP_SECOND_H
#ifndef _LIBCPP___CXX03___CHRONO_LEAP_SECOND_H
#define _LIBCPP___CXX03___CHRONO_LEAP_SECOND_H

#include <__cxx03/version>
// Enable the contents of the header only when libc++ was built with experimental features enabled.
Expand Down Expand Up @@ -123,4 +123,4 @@ _LIBCPP_END_NAMESPACE_STD

#endif // !defined(_LIBCPP_HAS_NO_EXPERIMENTAL_TZDB)

#endif // _LIBCPP___CHRONO_LEAP_SECOND_H
#endif // _LIBCPP___CXX03___CHRONO_LEAP_SECOND_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__chrono/literals.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___CHRONO_LITERALS_H
#define _LIBCPP___CHRONO_LITERALS_H
#ifndef _LIBCPP___CXX03___CHRONO_LITERALS_H
#define _LIBCPP___CXX03___CHRONO_LITERALS_H

#include <__cxx03/__chrono/day.h>
#include <__cxx03/__chrono/year.h>
Expand Down Expand Up @@ -42,4 +42,4 @@ _LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP_STD_VER >= 20

#endif // _LIBCPP___CHRONO_LITERALS_H
#endif // _LIBCPP___CXX03___CHRONO_LITERALS_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__chrono/local_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

// For information see https://libcxx.llvm.org/DesignDocs/TimeZone.html

#ifndef _LIBCPP___CHRONO_LOCAL_INFO_H
#define _LIBCPP___CHRONO_LOCAL_INFO_H
#ifndef _LIBCPP___CXX03___CHRONO_LOCAL_INFO_H
#define _LIBCPP___CXX03___CHRONO_LOCAL_INFO_H

#include <__cxx03/version>
// Enable the contents of the header only when libc++ was built with experimental features enabled.
Expand Down Expand Up @@ -47,4 +47,4 @@ _LIBCPP_END_NAMESPACE_STD

#endif // !defined(_LIBCPP_HAS_NO_EXPERIMENTAL_TZDB)

#endif // _LIBCPP___CHRONO_LOCAL_INFO_H
#endif // _LIBCPP___CXX03___CHRONO_LOCAL_INFO_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__chrono/month.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___CHRONO_MONTH_H
#define _LIBCPP___CHRONO_MONTH_H
#ifndef _LIBCPP___CXX03___CHRONO_MONTH_H
#define _LIBCPP___CXX03___CHRONO_MONTH_H

#include <__cxx03/__chrono/duration.h>
#include <__cxx03/__config>
Expand Down Expand Up @@ -112,4 +112,4 @@ _LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP_STD_VER >= 20

#endif // _LIBCPP___CHRONO_MONTH_H
#endif // _LIBCPP___CXX03___CHRONO_MONTH_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__chrono/month_weekday.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___CHRONO_MONTH_WEEKDAY_H
#define _LIBCPP___CHRONO_MONTH_WEEKDAY_H
#ifndef _LIBCPP___CXX03___CHRONO_MONTH_WEEKDAY_H
#define _LIBCPP___CXX03___CHRONO_MONTH_WEEKDAY_H

#include <__cxx03/__chrono/month.h>
#include <__cxx03/__chrono/weekday.h>
Expand Down Expand Up @@ -102,4 +102,4 @@ _LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP_STD_VER >= 20

#endif // _LIBCPP___CHRONO_MONTH_WEEKDAY_H
#endif // _LIBCPP___CXX03___CHRONO_MONTH_WEEKDAY_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__chrono/monthday.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___CHRONO_MONTHDAY_H
#define _LIBCPP___CHRONO_MONTHDAY_H
#ifndef _LIBCPP___CXX03___CHRONO_MONTHDAY_H
#define _LIBCPP___CXX03___CHRONO_MONTHDAY_H

#include <__cxx03/__chrono/calendar.h>
#include <__cxx03/__chrono/day.h>
Expand Down Expand Up @@ -130,4 +130,4 @@ _LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP_STD_VER >= 20

#endif // _LIBCPP___CHRONO_MONTHDAY_H
#endif // _LIBCPP___CXX03___CHRONO_MONTHDAY_H
120 changes: 60 additions & 60 deletions libcxx/include/__cxx03/__chrono/ostream.h

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__chrono/parser_std_format_spec.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___CHRONO_PARSER_STD_FORMAT_SPEC_H
#define _LIBCPP___CHRONO_PARSER_STD_FORMAT_SPEC_H
#ifndef _LIBCPP___CXX03___CHRONO_PARSER_STD_FORMAT_SPEC_H
#define _LIBCPP___CXX03___CHRONO_PARSER_STD_FORMAT_SPEC_H

#include <__cxx03/__config>
#include <__cxx03/__format/concepts.h>
Expand Down Expand Up @@ -413,4 +413,4 @@ class _LIBCPP_TEMPLATE_VIS __parser_chrono {

_LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP___CHRONO_PARSER_STD_FORMAT_SPEC_H
#endif // _LIBCPP___CXX03___CHRONO_PARSER_STD_FORMAT_SPEC_H
10 changes: 5 additions & 5 deletions libcxx/include/__cxx03/__chrono/statically_widen.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___CHRONO_STATICALLY_WIDEN_H
#define _LIBCPP___CHRONO_STATICALLY_WIDEN_H
#ifndef _LIBCPP___CXX03___CHRONO_STATICALLY_WIDEN_H
#define _LIBCPP___CXX03___CHRONO_STATICALLY_WIDEN_H

// Implements the STATICALLY-WIDEN exposition-only function. ([time.general]/2)

Expand All @@ -32,7 +32,7 @@ _LIBCPP_HIDE_FROM_ABI constexpr const _CharT* __statically_widen(const char* __s
else
return __wstr;
}
# define _LIBCPP_STATICALLY_WIDEN(_CharT, __str) ::std::__statically_widen<_CharT>(__str, L##__str)
# define _LIBCPP___CXX03_STATICALLY_WIDEN(_CharT, __str) ::std::__statically_widen<_CharT>(__str, L##__str)
# else // _LIBCPP_HAS_NO_WIDE_CHARACTERS

// Without this indirection the unit test test/libcxx/modules_include.sh.cpp
Expand All @@ -42,11 +42,11 @@ template <__fmt_char_type _CharT>
_LIBCPP_HIDE_FROM_ABI constexpr const _CharT* __statically_widen(const char* __str) {
return __str;
}
# define _LIBCPP_STATICALLY_WIDEN(_CharT, __str) ::std::__statically_widen<_CharT>(__str)
# define _LIBCPP___CXX03_STATICALLY_WIDEN(_CharT, __str) ::std::__statically_widen<_CharT>(__str)
# endif // _LIBCPP_HAS_NO_WIDE_CHARACTERS

#endif //_LIBCPP_STD_VER >= 20

_LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP___CHRONO_STATICALLY_WIDEN_H
#endif // _LIBCPP___CXX03___CHRONO_STATICALLY_WIDEN_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__chrono/steady_clock.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___CHRONO_STEADY_CLOCK_H
#define _LIBCPP___CHRONO_STEADY_CLOCK_H
#ifndef _LIBCPP___CXX03___CHRONO_STEADY_CLOCK_H
#define _LIBCPP___CXX03___CHRONO_STEADY_CLOCK_H

#include <__cxx03/__chrono/duration.h>
#include <__cxx03/__chrono/time_point.h>
Expand Down Expand Up @@ -39,4 +39,4 @@ class _LIBCPP_EXPORTED_FROM_ABI steady_clock {

_LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP___CHRONO_STEADY_CLOCK_H
#endif // _LIBCPP___CXX03___CHRONO_STEADY_CLOCK_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__chrono/sys_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

// For information see https://libcxx.llvm.org/DesignDocs/TimeZone.html

#ifndef _LIBCPP___CHRONO_SYS_INFO_H
#define _LIBCPP___CHRONO_SYS_INFO_H
#ifndef _LIBCPP___CXX03___CHRONO_SYS_INFO_H
#define _LIBCPP___CXX03___CHRONO_SYS_INFO_H

#include <__cxx03/version>
// Enable the contents of the header only when libc++ was built with experimental features enabled.
Expand Down Expand Up @@ -48,4 +48,4 @@ _LIBCPP_END_NAMESPACE_STD

#endif // !defined(_LIBCPP_HAS_NO_EXPERIMENTAL_TZDB)

#endif // _LIBCPP___CHRONO_SYS_INFO_H
#endif // _LIBCPP___CXX03___CHRONO_SYS_INFO_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__chrono/system_clock.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___CHRONO_SYSTEM_CLOCK_H
#define _LIBCPP___CHRONO_SYSTEM_CLOCK_H
#ifndef _LIBCPP___CXX03___CHRONO_SYSTEM_CLOCK_H
#define _LIBCPP___CXX03___CHRONO_SYSTEM_CLOCK_H

#include <__cxx03/__chrono/duration.h>
#include <__cxx03/__chrono/time_point.h>
Expand Down Expand Up @@ -49,4 +49,4 @@ using sys_days = sys_time<days>;

_LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP___CHRONO_SYSTEM_CLOCK_H
#endif // _LIBCPP___CXX03___CHRONO_SYSTEM_CLOCK_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__chrono/time_point.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___CHRONO_TIME_POINT_H
#define _LIBCPP___CHRONO_TIME_POINT_H
#ifndef _LIBCPP___CXX03___CHRONO_TIME_POINT_H
#define _LIBCPP___CXX03___CHRONO_TIME_POINT_H

#include <__cxx03/__chrono/duration.h>
#include <__cxx03/__compare/ordering.h>
Expand Down Expand Up @@ -217,4 +217,4 @@ _LIBCPP_END_NAMESPACE_STD

_LIBCPP_POP_MACROS

#endif // _LIBCPP___CHRONO_TIME_POINT_H
#endif // _LIBCPP___CXX03___CHRONO_TIME_POINT_H
14 changes: 7 additions & 7 deletions libcxx/include/__cxx03/__chrono/time_zone.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

// For information see https://libcxx.llvm.org/DesignDocs/TimeZone.html

#ifndef _LIBCPP___CHRONO_TIME_ZONE_H
#define _LIBCPP___CHRONO_TIME_ZONE_H
#ifndef _LIBCPP___CXX03___CHRONO_TIME_ZONE_H
#define _LIBCPP___CXX03___CHRONO_TIME_ZONE_H

#include <__cxx03/version>
// Enable the contents of the header only when libc++ was built with experimental features enabled.
Expand All @@ -37,8 +37,8 @@ _LIBCPP_PUSH_MACROS

_LIBCPP_BEGIN_NAMESPACE_STD

# if _LIBCPP_STD_VER >= 20 && !defined(_LIBCPP_HAS_NO_TIME_ZONE_DATABASE) && !defined(_LIBCPP_HAS_NO_FILESYSTEM) && \
!defined(_LIBCPP_HAS_NO_LOCALIZATION)
# if _LIBCPP_STD_VER >= 20 && !defined(_LIBCPP___CXX03_HAS_NO_TIME_ZONE_DATABASE) && !defined(_LIBCPP___CXX03_HAS_NO_FILESYSTEM) && \
!defined(_LIBCPP___CXX03_HAS_NO_LOCALIZATION)

namespace chrono {

Expand Down Expand Up @@ -170,13 +170,13 @@ operator<=>(const time_zone& __x, const time_zone& __y) noexcept {

} // namespace chrono

# endif // _LIBCPP_STD_VER >= 20 && !defined(_LIBCPP_HAS_NO_TIME_ZONE_DATABASE) && !defined(_LIBCPP_HAS_NO_FILESYSTEM)
// && !defined(_LIBCPP_HAS_NO_LOCALIZATION)
# endif // _LIBCPP_STD_VER >= 20 && !defined(_LIBCPP___CXX03_HAS_NO_TIME_ZONE_DATABASE) && !defined(_LIBCPP___CXX03_HAS_NO_FILESYSTEM)
// && !defined(_LIBCPP___CXX03_HAS_NO_LOCALIZATION)

_LIBCPP_END_NAMESPACE_STD

_LIBCPP_POP_MACROS

#endif // !defined(_LIBCPP_HAS_NO_EXPERIMENTAL_TZDB)

#endif // _LIBCPP___CHRONO_TIME_ZONE_H
#endif // _LIBCPP___CXX03___CHRONO_TIME_ZONE_H
10 changes: 5 additions & 5 deletions libcxx/include/__cxx03/__chrono/time_zone_link.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

// For information see https://libcxx.llvm.org/DesignDocs/TimeZone.html

#ifndef _LIBCPP___CHRONO_TIME_ZONE_LINK_H
#define _LIBCPP___CHRONO_TIME_ZONE_LINK_H
#ifndef _LIBCPP___CXX03___CHRONO_TIME_ZONE_LINK_H
#define _LIBCPP___CXX03___CHRONO_TIME_ZONE_LINK_H

#include <__cxx03/version>
// Enable the contents of the header only when libc++ was built with experimental features enabled.
Expand All @@ -31,8 +31,8 @@ _LIBCPP_PUSH_MACROS

_LIBCPP_BEGIN_NAMESPACE_STD

# if _LIBCPP_STD_VER >= 20 && !defined(_LIBCPP_HAS_NO_TIME_ZONE_DATABASE) && !defined(_LIBCPP_HAS_NO_FILESYSTEM) && \
!defined(_LIBCPP_HAS_NO_LOCALIZATION)
# if _LIBCPP_STD_VER >= 20 && !defined(_LIBCPP___CXX03_HAS_NO_TIME_ZONE_DATABASE) && !defined(_LIBCPP___CXX03_HAS_NO_FILESYSTEM) && \
!defined(_LIBCPP___CXX03_HAS_NO_LOCALIZATION)

namespace chrono {

Expand Down Expand Up @@ -76,4 +76,4 @@ _LIBCPP_POP_MACROS

#endif // !defined(_LIBCPP_HAS_NO_EXPERIMENTAL_TZDB)

#endif // _LIBCPP___CHRONO_TIME_ZONE_LINK_H
#endif // _LIBCPP___CXX03___CHRONO_TIME_ZONE_LINK_H
14 changes: 7 additions & 7 deletions libcxx/include/__cxx03/__chrono/tzdb.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

// For information see https://libcxx.llvm.org/DesignDocs/TimeZone.html

#ifndef _LIBCPP___CHRONO_TZDB_H
#define _LIBCPP___CHRONO_TZDB_H
#ifndef _LIBCPP___CXX03___CHRONO_TZDB_H
#define _LIBCPP___CXX03___CHRONO_TZDB_H

#include <__cxx03/version>
// Enable the contents of the header only when libc++ was built with experimental features enabled.
Expand All @@ -33,8 +33,8 @@ _LIBCPP_PUSH_MACROS

_LIBCPP_BEGIN_NAMESPACE_STD

# if _LIBCPP_STD_VER >= 20 && !defined(_LIBCPP_HAS_NO_TIME_ZONE_DATABASE) && !defined(_LIBCPP_HAS_NO_FILESYSTEM) && \
!defined(_LIBCPP_HAS_NO_LOCALIZATION)
# if _LIBCPP_STD_VER >= 20 && !defined(_LIBCPP___CXX03_HAS_NO_TIME_ZONE_DATABASE) && !defined(_LIBCPP___CXX03_HAS_NO_FILESYSTEM) && \
!defined(_LIBCPP___CXX03_HAS_NO_LOCALIZATION)

namespace chrono {

Expand Down Expand Up @@ -82,13 +82,13 @@ struct tzdb {

} // namespace chrono

# endif // _LIBCPP_STD_VER >= 20 && !defined(_LIBCPP_HAS_NO_TIME_ZONE_DATABASE) && !defined(_LIBCPP_HAS_NO_FILESYSTEM)
// && !defined(_LIBCPP_HAS_NO_LOCALIZATION)
# endif // _LIBCPP_STD_VER >= 20 && !defined(_LIBCPP___CXX03_HAS_NO_TIME_ZONE_DATABASE) && !defined(_LIBCPP___CXX03_HAS_NO_FILESYSTEM)
// && !defined(_LIBCPP___CXX03_HAS_NO_LOCALIZATION)

_LIBCPP_END_NAMESPACE_STD

_LIBCPP_POP_MACROS

#endif // !defined(_LIBCPP_HAS_NO_EXPERIMENTAL_TZDB)

#endif // _LIBCPP___CHRONO_TZDB_H
#endif // _LIBCPP___CXX03___CHRONO_TZDB_H
14 changes: 7 additions & 7 deletions libcxx/include/__cxx03/__chrono/tzdb_list.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

// For information see https://libcxx.llvm.org/DesignDocs/TimeZone.html

#ifndef _LIBCPP___CHRONO_TZDB_LIST_H
#define _LIBCPP___CHRONO_TZDB_LIST_H
#ifndef _LIBCPP___CXX03___CHRONO_TZDB_LIST_H
#define _LIBCPP___CXX03___CHRONO_TZDB_LIST_H

#include <__cxx03/version>
// Enable the contents of the header only when libc++ was built with experimental features enabled.
Expand All @@ -28,8 +28,8 @@

_LIBCPP_BEGIN_NAMESPACE_STD

# if _LIBCPP_STD_VER >= 20 && !defined(_LIBCPP_HAS_NO_TIME_ZONE_DATABASE) && !defined(_LIBCPP_HAS_NO_FILESYSTEM) && \
!defined(_LIBCPP_HAS_NO_LOCALIZATION)
# if _LIBCPP_STD_VER >= 20 && !defined(_LIBCPP___CXX03_HAS_NO_TIME_ZONE_DATABASE) && !defined(_LIBCPP___CXX03_HAS_NO_FILESYSTEM) && \
!defined(_LIBCPP___CXX03_HAS_NO_LOCALIZATION)

namespace chrono {

Expand Down Expand Up @@ -98,11 +98,11 @@ _LIBCPP_AVAILABILITY_TZDB _LIBCPP_EXPORTED_FROM_ABI const tzdb& reload_tzdb();

} // namespace chrono

# endif // _LIBCPP_STD_VER >= 20 && !defined(_LIBCPP_HAS_NO_TIME_ZONE_DATABASE) && !defined(_LIBCPP_HAS_NO_FILESYSTEM)
// && !defined(_LIBCPP_HAS_NO_LOCALIZATION)
# endif // _LIBCPP_STD_VER >= 20 && !defined(_LIBCPP___CXX03_HAS_NO_TIME_ZONE_DATABASE) && !defined(_LIBCPP___CXX03_HAS_NO_FILESYSTEM)
// && !defined(_LIBCPP___CXX03_HAS_NO_LOCALIZATION)

_LIBCPP_END_NAMESPACE_STD

#endif // !defined(_LIBCPP_HAS_NO_EXPERIMENTAL_TZDB)

#endif // _LIBCPP___CHRONO_TZDB_LIST_H
#endif // _LIBCPP___CXX03___CHRONO_TZDB_LIST_H
10 changes: 5 additions & 5 deletions libcxx/include/__cxx03/__chrono/weekday.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___CHRONO_WEEKDAY_H
#define _LIBCPP___CHRONO_WEEKDAY_H
#ifndef _LIBCPP___CXX03___CHRONO_WEEKDAY_H
#define _LIBCPP___CXX03___CHRONO_WEEKDAY_H

#include <__cxx03/__chrono/calendar.h>
#include <__cxx03/__chrono/duration.h>
Expand Down Expand Up @@ -80,7 +80,7 @@ _LIBCPP_HIDE_FROM_ABI inline constexpr bool operator==(const weekday& __lhs, con
}

// TODO(LLVM 20): Remove the escape hatch
# ifdef _LIBCPP_ENABLE_REMOVED_WEEKDAY_RELATIONAL_OPERATORS
# ifdef _LIBCPP___CXX03_ENABLE_REMOVED_WEEKDAY_RELATIONAL_OPERATORS
_LIBCPP_HIDE_FROM_ABI inline constexpr bool operator<(const weekday& __lhs, const weekday& __rhs) noexcept {
return __lhs.c_encoding() < __rhs.c_encoding();
}
Expand All @@ -96,7 +96,7 @@ _LIBCPP_HIDE_FROM_ABI inline constexpr bool operator<=(const weekday& __lhs, con
_LIBCPP_HIDE_FROM_ABI inline constexpr bool operator>=(const weekday& __lhs, const weekday& __rhs) noexcept {
return !(__lhs < __rhs);
}
# endif // _LIBCPP_ENABLE_REMOVED_WEEKDAY_RELATIONAL_OPERATORS
# endif // _LIBCPP___CXX03_ENABLE_REMOVED_WEEKDAY_RELATIONAL_OPERATORS

_LIBCPP_HIDE_FROM_ABI inline constexpr weekday operator+(const weekday& __lhs, const days& __rhs) noexcept {
auto const __mu = static_cast<long long>(__lhs.c_encoding()) + __rhs.count();
Expand Down Expand Up @@ -183,4 +183,4 @@ _LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP_STD_VER >= 20

#endif // _LIBCPP___CHRONO_WEEKDAY_H
#endif // _LIBCPP___CXX03___CHRONO_WEEKDAY_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__chrono/year.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___CHRONO_YEAR_H
#define _LIBCPP___CHRONO_YEAR_H
#ifndef _LIBCPP___CXX03___CHRONO_YEAR_H
#define _LIBCPP___CXX03___CHRONO_YEAR_H

#include <__cxx03/__chrono/duration.h>
#include <__cxx03/__config>
Expand Down Expand Up @@ -115,4 +115,4 @@ _LIBCPP_END_NAMESPACE_STD

_LIBCPP_POP_MACROS

#endif // _LIBCPP___CHRONO_YEAR_H
#endif // _LIBCPP___CXX03___CHRONO_YEAR_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__chrono/year_month.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___CHRONO_YEAR_MONTH_H
#define _LIBCPP___CHRONO_YEAR_MONTH_H
#ifndef _LIBCPP___CXX03___CHRONO_YEAR_MONTH_H
#define _LIBCPP___CXX03___CHRONO_YEAR_MONTH_H

#include <__cxx03/__chrono/duration.h>
#include <__cxx03/__chrono/month.h>
Expand Down Expand Up @@ -120,4 +120,4 @@ _LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP_STD_VER >= 20

#endif // _LIBCPP___CHRONO_YEAR_MONTH_H
#endif // _LIBCPP___CXX03___CHRONO_YEAR_MONTH_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__chrono/year_month_day.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___CHRONO_YEAR_MONTH_DAY_H
#define _LIBCPP___CHRONO_YEAR_MONTH_DAY_H
#ifndef _LIBCPP___CXX03___CHRONO_YEAR_MONTH_DAY_H
#define _LIBCPP___CXX03___CHRONO_YEAR_MONTH_DAY_H

#include <__cxx03/__chrono/calendar.h>
#include <__cxx03/__chrono/day.h>
Expand Down Expand Up @@ -334,4 +334,4 @@ _LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP_STD_VER >= 20

#endif // _LIBCPP___CHRONO_YEAR_MONTH_DAY_H
#endif // _LIBCPP___CXX03___CHRONO_YEAR_MONTH_DAY_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__chrono/year_month_weekday.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___CHRONO_YEAR_MONTH_WEEKDAY_H
#define _LIBCPP___CHRONO_YEAR_MONTH_WEEKDAY_H
#ifndef _LIBCPP___CXX03___CHRONO_YEAR_MONTH_WEEKDAY_H
#define _LIBCPP___CXX03___CHRONO_YEAR_MONTH_WEEKDAY_H

#include <__cxx03/__chrono/calendar.h>
#include <__cxx03/__chrono/day.h>
Expand Down Expand Up @@ -284,4 +284,4 @@ _LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP_STD_VER >= 20

#endif // _LIBCPP___CHRONO_YEAR_MONTH_WEEKDAY_H
#endif // _LIBCPP___CXX03___CHRONO_YEAR_MONTH_WEEKDAY_H
14 changes: 7 additions & 7 deletions libcxx/include/__cxx03/__chrono/zoned_time.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

// For information see https://libcxx.llvm.org/DesignDocs/TimeZone.html

#ifndef _LIBCPP___CHRONO_ZONED_TIME_H
#define _LIBCPP___CHRONO_ZONED_TIME_H
#ifndef _LIBCPP___CXX03___CHRONO_ZONED_TIME_H
#define _LIBCPP___CXX03___CHRONO_ZONED_TIME_H

#include <__cxx03/version>
// Enable the contents of the header only when libc++ was built with experimental features enabled.
Expand Down Expand Up @@ -38,8 +38,8 @@ _LIBCPP_PUSH_MACROS

_LIBCPP_BEGIN_NAMESPACE_STD

# if _LIBCPP_STD_VER >= 20 && !defined(_LIBCPP_HAS_NO_TIME_ZONE_DATABASE) && !defined(_LIBCPP_HAS_NO_FILESYSTEM) && \
!defined(_LIBCPP_HAS_NO_LOCALIZATION)
# if _LIBCPP_STD_VER >= 20 && !defined(_LIBCPP___CXX03_HAS_NO_TIME_ZONE_DATABASE) && !defined(_LIBCPP___CXX03_HAS_NO_FILESYSTEM) && \
!defined(_LIBCPP___CXX03_HAS_NO_LOCALIZATION)

namespace chrono {

Expand Down Expand Up @@ -215,13 +215,13 @@ operator==(const zoned_time<_Duration1, _TimeZonePtr>& __lhs, const zoned_time<_

} // namespace chrono

# endif // _LIBCPP_STD_VER >= 20 && !defined(_LIBCPP_HAS_NO_TIME_ZONE_DATABASE) && !defined(_LIBCPP_HAS_NO_FILESYSTEM)
// && !defined(_LIBCPP_HAS_NO_LOCALIZATION)
# endif // _LIBCPP_STD_VER >= 20 && !defined(_LIBCPP___CXX03_HAS_NO_TIME_ZONE_DATABASE) && !defined(_LIBCPP___CXX03_HAS_NO_FILESYSTEM)
// && !defined(_LIBCPP___CXX03_HAS_NO_LOCALIZATION)

_LIBCPP_END_NAMESPACE_STD

_LIBCPP_POP_MACROS

#endif // !defined(_LIBCPP_HAS_NO_EXPERIMENTAL_TZDB)

#endif // _LIBCPP___CHRONO_ZONED_TIME_H
#endif // _LIBCPP___CXX03___CHRONO_ZONED_TIME_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__compare/common_comparison_category.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___COMPARE_COMMON_COMPARISON_CATEGORY_H
#define _LIBCPP___COMPARE_COMMON_COMPARISON_CATEGORY_H
#ifndef _LIBCPP___CXX03___COMPARE_COMMON_COMPARISON_CATEGORY_H
#define _LIBCPP___CXX03___COMPARE_COMMON_COMPARISON_CATEGORY_H

#include <__cxx03/__compare/ordering.h>
#include <__cxx03/__config>
Expand Down Expand Up @@ -83,4 +83,4 @@ using common_comparison_category_t = typename common_comparison_category<_Ts...>

_LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP___COMPARE_COMMON_COMPARISON_CATEGORY_H
#endif // _LIBCPP___CXX03___COMPARE_COMMON_COMPARISON_CATEGORY_H
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___COMPARE_COMPARE_PARTIAL_ORDER_FALLBACK
#define _LIBCPP___COMPARE_COMPARE_PARTIAL_ORDER_FALLBACK
#ifndef _LIBCPP___CXX03___COMPARE_COMPARE_PARTIAL_ORDER_FALLBACK
#define _LIBCPP___CXX03___COMPARE_COMPARE_PARTIAL_ORDER_FALLBACK

#include <__cxx03/__compare/ordering.h>
#include <__cxx03/__compare/partial_order.h>
Expand Down Expand Up @@ -73,4 +73,4 @@ inline constexpr auto compare_partial_order_fallback = __compare_partial_order_f

_LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP___COMPARE_COMPARE_PARTIAL_ORDER_FALLBACK
#endif // _LIBCPP___CXX03___COMPARE_COMPARE_PARTIAL_ORDER_FALLBACK
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___COMPARE_COMPARE_STRONG_ORDER_FALLBACK
#define _LIBCPP___COMPARE_COMPARE_STRONG_ORDER_FALLBACK
#ifndef _LIBCPP___CXX03___COMPARE_COMPARE_STRONG_ORDER_FALLBACK
#define _LIBCPP___CXX03___COMPARE_COMPARE_STRONG_ORDER_FALLBACK

#include <__cxx03/__compare/ordering.h>
#include <__cxx03/__compare/strong_order.h>
Expand Down Expand Up @@ -70,4 +70,4 @@ inline constexpr auto compare_strong_order_fallback = __compare_strong_order_fal

_LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP___COMPARE_COMPARE_STRONG_ORDER_FALLBACK
#endif // _LIBCPP___CXX03___COMPARE_COMPARE_STRONG_ORDER_FALLBACK
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__compare/compare_three_way.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___COMPARE_COMPARE_THREE_WAY_H
#define _LIBCPP___COMPARE_COMPARE_THREE_WAY_H
#ifndef _LIBCPP___CXX03___COMPARE_COMPARE_THREE_WAY_H
#define _LIBCPP___CXX03___COMPARE_COMPARE_THREE_WAY_H

#include <__cxx03/__compare/three_way_comparable.h>
#include <__cxx03/__config>
Expand Down Expand Up @@ -37,4 +37,4 @@ struct _LIBCPP_TEMPLATE_VIS compare_three_way {

_LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP___COMPARE_COMPARE_THREE_WAY_H
#endif // _LIBCPP___CXX03___COMPARE_COMPARE_THREE_WAY_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__compare/compare_three_way_result.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___COMPARE_COMPARE_THREE_WAY_RESULT_H
#define _LIBCPP___COMPARE_COMPARE_THREE_WAY_RESULT_H
#ifndef _LIBCPP___CXX03___COMPARE_COMPARE_THREE_WAY_RESULT_H
#define _LIBCPP___CXX03___COMPARE_COMPARE_THREE_WAY_RESULT_H

#include <__cxx03/__config>
#include <__cxx03/__type_traits/make_const_lvalue_ref.h>
Expand Down Expand Up @@ -42,4 +42,4 @@ using compare_three_way_result_t = typename compare_three_way_result<_Tp, _Up>::

_LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP___COMPARE_COMPARE_THREE_WAY_RESULT_H
#endif // _LIBCPP___CXX03___COMPARE_COMPARE_THREE_WAY_RESULT_H
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___COMPARE_COMPARE_WEAK_ORDER_FALLBACK
#define _LIBCPP___COMPARE_COMPARE_WEAK_ORDER_FALLBACK
#ifndef _LIBCPP___CXX03___COMPARE_COMPARE_WEAK_ORDER_FALLBACK
#define _LIBCPP___CXX03___COMPARE_COMPARE_WEAK_ORDER_FALLBACK

#include <__cxx03/__compare/ordering.h>
#include <__cxx03/__compare/weak_order.h>
Expand Down Expand Up @@ -70,4 +70,4 @@ inline constexpr auto compare_weak_order_fallback = __compare_weak_order_fallbac

_LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP___COMPARE_COMPARE_WEAK_ORDER_FALLBACK
#endif // _LIBCPP___CXX03___COMPARE_COMPARE_WEAK_ORDER_FALLBACK
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__compare/is_eq.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___COMPARE_IS_EQ_H
#define _LIBCPP___COMPARE_IS_EQ_H
#ifndef _LIBCPP___CXX03___COMPARE_IS_EQ_H
#define _LIBCPP___CXX03___COMPARE_IS_EQ_H

#include <__cxx03/__compare/ordering.h>
#include <__cxx03/__config>
Expand All @@ -31,4 +31,4 @@ _LIBCPP_HIDE_FROM_ABI inline constexpr bool is_gteq(partial_ordering __c) noexce

_LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP___COMPARE_IS_EQ_H
#endif // _LIBCPP___CXX03___COMPARE_IS_EQ_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__compare/ordering.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___COMPARE_ORDERING_H
#define _LIBCPP___COMPARE_ORDERING_H
#ifndef _LIBCPP___CXX03___COMPARE_ORDERING_H
#define _LIBCPP___CXX03___COMPARE_ORDERING_H

#include <__cxx03/__config>
#include <__cxx03/__type_traits/enable_if.h>
Expand Down Expand Up @@ -275,4 +275,4 @@ concept __comparison_category = __one_of_v<_Tp, partial_ordering, weak_ordering,

_LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP___COMPARE_ORDERING_H
#endif // _LIBCPP___CXX03___COMPARE_ORDERING_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__compare/partial_order.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___COMPARE_PARTIAL_ORDER
#define _LIBCPP___COMPARE_PARTIAL_ORDER
#ifndef _LIBCPP___CXX03___COMPARE_PARTIAL_ORDER
#define _LIBCPP___CXX03___COMPARE_PARTIAL_ORDER

#include <__cxx03/__compare/compare_three_way.h>
#include <__cxx03/__compare/ordering.h>
Expand Down Expand Up @@ -74,4 +74,4 @@ inline constexpr auto partial_order = __partial_order::__fn{};

_LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP___COMPARE_PARTIAL_ORDER
#endif // _LIBCPP___CXX03___COMPARE_PARTIAL_ORDER
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__compare/strong_order.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___COMPARE_STRONG_ORDER
#define _LIBCPP___COMPARE_STRONG_ORDER
#ifndef _LIBCPP___CXX03___COMPARE_STRONG_ORDER
#define _LIBCPP___CXX03___COMPARE_STRONG_ORDER

#include <__cxx03/__bit/bit_cast.h>
#include <__cxx03/__compare/compare_three_way.h>
Expand Down Expand Up @@ -140,4 +140,4 @@ _LIBCPP_END_NAMESPACE_STD

_LIBCPP_POP_MACROS

#endif // _LIBCPP___COMPARE_STRONG_ORDER
#endif // _LIBCPP___CXX03___COMPARE_STRONG_ORDER
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__compare/synth_three_way.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___COMPARE_SYNTH_THREE_WAY_H
#define _LIBCPP___COMPARE_SYNTH_THREE_WAY_H
#ifndef _LIBCPP___CXX03___COMPARE_SYNTH_THREE_WAY_H
#define _LIBCPP___CXX03___COMPARE_SYNTH_THREE_WAY_H

#include <__cxx03/__compare/ordering.h>
#include <__cxx03/__compare/three_way_comparable.h>
Expand Down Expand Up @@ -49,4 +49,4 @@ using __synth_three_way_result = decltype(std::__synth_three_way(std::declval<_T

_LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP___COMPARE_SYNTH_THREE_WAY_H
#endif // _LIBCPP___CXX03___COMPARE_SYNTH_THREE_WAY_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__compare/three_way_comparable.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___COMPARE_THREE_WAY_COMPARABLE_H
#define _LIBCPP___COMPARE_THREE_WAY_COMPARABLE_H
#ifndef _LIBCPP___CXX03___COMPARE_THREE_WAY_COMPARABLE_H
#define _LIBCPP___CXX03___COMPARE_THREE_WAY_COMPARABLE_H

#include <__cxx03/__compare/common_comparison_category.h>
#include <__cxx03/__compare/ordering.h>
Expand Down Expand Up @@ -52,4 +52,4 @@ concept three_way_comparable_with =

_LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP___COMPARE_THREE_WAY_COMPARABLE_H
#endif // _LIBCPP___CXX03___COMPARE_THREE_WAY_COMPARABLE_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__compare/weak_order.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___COMPARE_WEAK_ORDER
#define _LIBCPP___COMPARE_WEAK_ORDER
#ifndef _LIBCPP___CXX03___COMPARE_WEAK_ORDER
#define _LIBCPP___CXX03___COMPARE_WEAK_ORDER

#include <__cxx03/__compare/compare_three_way.h>
#include <__cxx03/__compare/ordering.h>
Expand Down Expand Up @@ -102,4 +102,4 @@ inline constexpr auto weak_order = __weak_order::__fn{};

_LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP___COMPARE_WEAK_ORDER
#endif // _LIBCPP___CXX03___COMPARE_WEAK_ORDER
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__concepts/arithmetic.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___CONCEPTS_ARITHMETIC_H
#define _LIBCPP___CONCEPTS_ARITHMETIC_H
#ifndef _LIBCPP___CXX03___CONCEPTS_ARITHMETIC_H
#define _LIBCPP___CXX03___CONCEPTS_ARITHMETIC_H

#include <__cxx03/__config>
#include <__cxx03/__type_traits/is_floating_point.h>
Expand Down Expand Up @@ -53,4 +53,4 @@ concept __libcpp_integer = __libcpp_unsigned_integer<_Tp> || __libcpp_signed_int

_LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP___CONCEPTS_ARITHMETIC_H
#endif // _LIBCPP___CXX03___CONCEPTS_ARITHMETIC_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__concepts/assignable.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___CONCEPTS_ASSIGNABLE_H
#define _LIBCPP___CONCEPTS_ASSIGNABLE_H
#ifndef _LIBCPP___CXX03___CONCEPTS_ASSIGNABLE_H
#define _LIBCPP___CXX03___CONCEPTS_ASSIGNABLE_H

#include <__cxx03/__concepts/common_reference_with.h>
#include <__cxx03/__concepts/same_as.h>
Expand Down Expand Up @@ -38,4 +38,4 @@ concept assignable_from =

_LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP___CONCEPTS_ASSIGNABLE_H
#endif // _LIBCPP___CXX03___CONCEPTS_ASSIGNABLE_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__concepts/boolean_testable.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___CONCEPTS_BOOLEAN_TESTABLE_H
#define _LIBCPP___CONCEPTS_BOOLEAN_TESTABLE_H
#ifndef _LIBCPP___CXX03___CONCEPTS_BOOLEAN_TESTABLE_H
#define _LIBCPP___CXX03___CONCEPTS_BOOLEAN_TESTABLE_H

#include <__cxx03/__concepts/convertible_to.h>
#include <__cxx03/__config>
Expand Down Expand Up @@ -35,4 +35,4 @@ concept __boolean_testable = __boolean_testable_impl<_Tp> && requires(_Tp&& __t)

_LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP___CONCEPTS_BOOLEAN_TESTABLE_H
#endif // _LIBCPP___CXX03___CONCEPTS_BOOLEAN_TESTABLE_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__concepts/class_or_enum.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___CONCEPTS_CLASS_OR_ENUM_H
#define _LIBCPP___CONCEPTS_CLASS_OR_ENUM_H
#ifndef _LIBCPP___CXX03___CONCEPTS_CLASS_OR_ENUM_H
#define _LIBCPP___CXX03___CONCEPTS_CLASS_OR_ENUM_H

#include <__cxx03/__config>
#include <__cxx03/__type_traits/is_class.h>
Expand All @@ -32,4 +32,4 @@ concept __class_or_enum = is_class_v<_Tp> || is_union_v<_Tp> || is_enum_v<_Tp>;

_LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP___CONCEPTS_CLASS_OR_ENUM_H
#endif // _LIBCPP___CXX03___CONCEPTS_CLASS_OR_ENUM_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__concepts/common_reference_with.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___CONCEPTS_COMMON_REFERENCE_WITH_H
#define _LIBCPP___CONCEPTS_COMMON_REFERENCE_WITH_H
#ifndef _LIBCPP___CXX03___CONCEPTS_COMMON_REFERENCE_WITH_H
#define _LIBCPP___CXX03___CONCEPTS_COMMON_REFERENCE_WITH_H

#include <__cxx03/__concepts/convertible_to.h>
#include <__cxx03/__concepts/same_as.h>
Expand All @@ -33,4 +33,4 @@ concept common_reference_with =

_LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP___CONCEPTS_COMMON_REFERENCE_WITH_H
#endif // _LIBCPP___CXX03___CONCEPTS_COMMON_REFERENCE_WITH_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__concepts/common_with.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___CONCEPTS_COMMON_WITH_H
#define _LIBCPP___CONCEPTS_COMMON_WITH_H
#ifndef _LIBCPP___CXX03___CONCEPTS_COMMON_WITH_H
#define _LIBCPP___CXX03___CONCEPTS_COMMON_WITH_H

#include <__cxx03/__concepts/common_reference_with.h>
#include <__cxx03/__concepts/same_as.h>
Expand Down Expand Up @@ -49,4 +49,4 @@ concept common_with =

_LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP___CONCEPTS_COMMON_WITH_H
#endif // _LIBCPP___CXX03___CONCEPTS_COMMON_WITH_H
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__concepts/constructible.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _LIBCPP___CONCEPTS_CONSTRUCTIBLE_H
#define _LIBCPP___CONCEPTS_CONSTRUCTIBLE_H
#ifndef _LIBCPP___CXX03___CONCEPTS_CONSTRUCTIBLE_H
#define _LIBCPP___CXX03___CONCEPTS_CONSTRUCTIBLE_H

#include <__cxx03/__concepts/convertible_to.h>
#include <__cxx03/__concepts/destructible.h>
Expand Down Expand Up @@ -52,4 +52,4 @@ concept copy_constructible =

_LIBCPP_END_NAMESPACE_STD

#endif // _LIBCPP___CONCEPTS_CONSTRUCTIBLE_H
#endif // _LIBCPP___CXX03___CONCEPTS_CONSTRUCTIBLE_H
Loading