Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

standardize ^^^ x / !x vvv comments #3208

Merged
merged 3 commits into from
Dec 6, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion stl/inc/algorithm
Original file line number Diff line number Diff line change
Expand Up @@ -8123,7 +8123,7 @@ namespace ranges {
// divide and conquer by quicksort
#if defined(__clang__) || defined(__EDG__) // TRANSITION, DevCom-1559808
auto [_Mid_first, _Mid_last] = _Partition_by_median_guess_common(_First, _Last, _Pred, _Proj);
#else // ^^^ no workaround // workaround vvv
#else // ^^^ no workaround / workaround vvv
auto _Mid = _Partition_by_median_guess_common(_First, _Last, _Pred, _Proj);
auto _Mid_first = _Mid.begin();
auto _Mid_last = _Mid.end();
Expand Down
4 changes: 2 additions & 2 deletions stl/inc/array
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ public:
_NODISCARD constexpr strong_ordering operator<=>(const _Array_const_iterator& _Right) const noexcept {
return _Ptr <=> _Right._Ptr;
}
#else // ^^^ _HAS_CXX20 ^^^ / vvv !_HAS_CXX20 vvv
#else // ^^^ _HAS_CXX20 / !_HAS_CXX20 vvv
_NODISCARD _CONSTEXPR17 bool operator<(const _Array_const_iterator& _Right) const noexcept {
return _Ptr < _Right._Ptr;
}
Expand Down Expand Up @@ -209,7 +209,7 @@ private:
_Compat(_Right);
return _Idx <=> _Right._Idx;
}
#else // ^^^ _HAS_CXX20 ^^^ / vvv !_HAS_CXX20 vvv
#else // ^^^ _HAS_CXX20 / !_HAS_CXX20 vvv
_NODISCARD _CONSTEXPR17 bool operator<(const _Array_const_iterator& _Right) const noexcept {
_Compat(_Right);
return _Idx < _Right._Idx;
Expand Down
4 changes: 2 additions & 2 deletions stl/inc/atomic
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ _STL_DISABLE_CLANG_WARNINGS
#ifdef _WIN64
#if _STD_ATOMIC_ALWAYS_USE_CMPXCHG16B == 1
#define _STD_COMPARE_EXCHANGE_128 _InterlockedCompareExchange128
#else // ^^^ _STD_ATOMIC_ALWAYS_USE_CMPXCHG16B == 1 // _STD_ATOMIC_ALWAYS_USE_CMPXCHG16B == 0 vvv
#else // ^^^ _STD_ATOMIC_ALWAYS_USE_CMPXCHG16B == 1 / _STD_ATOMIC_ALWAYS_USE_CMPXCHG16B == 0 vvv
// 16-byte atomics are separately compiled for x64, as not all x64 hardware has the cmpxchg16b
// instruction; in the event this instruction is not available, the fallback is a global
// synchronization object shared by all 16-byte atomics.
Expand Down Expand Up @@ -2067,7 +2067,7 @@ using _Choose_atomic_base2_t =
template <class _TVal, class _Ty = _TVal>
using _Choose_atomic_base_t = typename _Select<is_floating_point_v<_TVal>>::template _Apply<_Atomic_floating<_Ty>,
_Choose_atomic_base2_t<_TVal, _Ty>>;
#else // ^^^ _HAS_CXX20 // !_HAS_CXX20 vvv
#else // ^^^ _HAS_CXX20 / !_HAS_CXX20 vvv
template <class _TVal, class _Ty = _TVal>
using _Choose_atomic_base_t = _Choose_atomic_base2_t<_TVal, _Ty>;
#endif // _HAS_CXX20
Expand Down
2 changes: 1 addition & 1 deletion stl/inc/bitset
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public:
static _CONSTEXPR23 void _Validate(const size_t _Pos) noexcept { // verify that _Pos is within bounds
#if _ITERATOR_DEBUG_LEVEL == 0
(void) _Pos;
#else // ^^^ _ITERATOR_DEBUG_LEVEL == 0 ^^^ // vvv _ITERATOR_DEBUG_LEVEL != 0 vvv
#else // ^^^ _ITERATOR_DEBUG_LEVEL == 0 / _ITERATOR_DEBUG_LEVEL != 0 vvv
_STL_VERIFY(_Pos < _Bits, "bitset index outside range");
#endif // _ITERATOR_DEBUG_LEVEL == 0
}
Expand Down
26 changes: 13 additions & 13 deletions stl/inc/cmath
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#if !defined(__clang__) && !defined(__CUDACC__) && !defined(__INTEL_COMPILER) \
&& !defined(_M_CEE) // TRANSITION, VSO-1663104
#define _HAS_CMATH_INTRINSICS 1
#else // ^^^ intrinsics available ^^^ / vvv intrinsics unavailable vvv
#else // ^^^ intrinsics available / intrinsics unavailable vvv
#define _HAS_CMATH_INTRINSICS 0
#endif // ^^^ intrinsics unavailable ^^^

Expand Down Expand Up @@ -71,7 +71,7 @@ _NODISCARD _Check_return_ inline float ceil(_In_ float _Xx) noexcept /* strength
return __ceilf(_Xx);
#elif defined(__clang__)
return __builtin_ceilf(_Xx);
#else // ^^^ defined(__clang__) ^^^ / vvv intrinsics unavailable vvv
#else // ^^^ defined(__clang__) / intrinsics unavailable vvv
return _CSTD ceilf(_Xx);
#endif // ^^^ intrinsics unavailable ^^^
}
Expand All @@ -81,7 +81,7 @@ _NODISCARD _Check_return_ inline float copysign(_In_ float _Number, _In_ float _
return __copysignf(_Number, _Sign);
#elif defined(__clang__)
return __builtin_copysignf(_Number, _Sign);
#else // ^^^ defined(__clang__) ^^^ / vvv intrinsics unavailable vvv
#else // ^^^ defined(__clang__) / intrinsics unavailable vvv
return _CSTD copysignf(_Number, _Sign);
#endif // ^^^ intrinsics unavailable ^^^
}
Expand Down Expand Up @@ -127,7 +127,7 @@ _NODISCARD _Check_return_ inline float floor(_In_ float _Xx) noexcept /* strengt
return __floorf(_Xx);
#elif defined(__clang__)
return __builtin_floorf(_Xx);
#else // ^^^ defined(__clang__) ^^^ / vvv intrinsics unavailable vvv
#else // ^^^ defined(__clang__) / intrinsics unavailable vvv
return _CSTD floorf(_Xx);
#endif // ^^^ intrinsics unavailable ^^^
}
Expand Down Expand Up @@ -241,7 +241,7 @@ _NODISCARD _Check_return_ inline float round(_In_ float _Xx) noexcept /* strengt
return __roundf(_Xx);
#elif defined(__clang__)
return __builtin_roundf(_Xx);
#else // ^^^ defined(__clang__) ^^^ / vvv intrinsics unavailable vvv
#else // ^^^ defined(__clang__) / intrinsics unavailable vvv
return _CSTD roundf(_Xx);
#endif // ^^^ intrinsics unavailable ^^^
}
Expand Down Expand Up @@ -283,7 +283,7 @@ _NODISCARD _Check_return_ inline float trunc(_In_ float _Xx) noexcept /* strengt
return __truncf(_Xx);
#elif defined(__clang__)
return __builtin_truncf(_Xx);
#else // ^^^ defined(__clang__) ^^^ / vvv intrinsics unavailable vvv
#else // ^^^ defined(__clang__) / intrinsics unavailable vvv
return _CSTD truncf(_Xx);
#endif // ^^^ intrinsics unavailable ^^^
}
Expand Down Expand Up @@ -326,7 +326,7 @@ _NODISCARD _Check_return_ inline long double ceil(_In_ long double _Xx) noexcept
return __ceil(static_cast<double>(_Xx));
#elif defined(__clang__)
return __builtin_ceill(_Xx);
#else // ^^^ defined(__clang__) ^^^ / vvv intrinsics unavailable vvv
#else // ^^^ defined(__clang__) / intrinsics unavailable vvv
return _CSTD ceill(_Xx);
#endif // ^^^ intrinsics unavailable ^^^
}
Expand All @@ -337,7 +337,7 @@ _NODISCARD _Check_return_ inline long double copysign(_In_ long double _Number,
return __copysign(static_cast<double>(_Number), static_cast<double>(_Sign));
#elif defined(__clang__)
return __builtin_copysignl(_Number, _Sign);
#else // ^^^ defined(__clang__) ^^^ / vvv intrinsics unavailable vvv
#else // ^^^ defined(__clang__) / intrinsics unavailable vvv
return _CSTD copysignl(_Number, _Sign);
#endif // ^^^ intrinsics unavailable ^^^
}
Expand Down Expand Up @@ -384,7 +384,7 @@ _NODISCARD _Check_return_ inline long double floor(_In_ long double _Xx) noexcep
return __floor(static_cast<double>(_Xx));
#elif defined(__clang__)
return __builtin_floorl(_Xx);
#else // ^^^ defined(__clang__) ^^^ / vvv intrinsics unavailable vvv
#else // ^^^ defined(__clang__) / intrinsics unavailable vvv
return _CSTD floorl(_Xx);
#endif // ^^^ intrinsics unavailable ^^^
}
Expand Down Expand Up @@ -507,7 +507,7 @@ _NODISCARD _Check_return_ inline long double round(_In_ long double _Xx) noexcep
return __round(static_cast<double>(_Xx));
#elif defined(__clang__)
return __builtin_roundl(_Xx);
#else // ^^^ defined(__clang__) ^^^ / vvv intrinsics unavailable vvv
#else // ^^^ defined(__clang__) / intrinsics unavailable vvv
return _CSTD roundl(_Xx);
#endif // ^^^ intrinsics unavailable ^^^
}
Expand Down Expand Up @@ -549,7 +549,7 @@ _NODISCARD _Check_return_ inline long double trunc(_In_ long double _Xx) noexcep
return __trunc(static_cast<double>(_Xx));
#elif defined(__clang__)
return __builtin_truncl(_Xx);
#else // ^^^ defined(__clang__) ^^^ / vvv intrinsics unavailable vvv
#else // ^^^ defined(__clang__) / intrinsics unavailable vvv
return _CSTD truncl(_Xx);
#endif // ^^^ intrinsics unavailable ^^^
}
Expand Down Expand Up @@ -606,7 +606,7 @@ _STD _Common_float_type_t<_Ty1, _Ty2> remquo(_Ty1 _Left, _Ty2 _Right, int* _Pquo
#define _GENERIC_MATH1I(FUN, CLANG_INTRIN, MSVC_INTRIN) _GENERIC_MATH1_BASE(FUN, double, MSVC_INTRIN)
#elif defined(__clang__)
#define _GENERIC_MATH1I(FUN, CLANG_INTRIN, MSVC_INTRIN) _GENERIC_MATH1_BASE(FUN, double, CLANG_INTRIN)
#else // ^^^ defined(__clang__) ^^^ / vvv intrinsics unavailable vvv
#else // ^^^ defined(__clang__) / intrinsics unavailable vvv
#define _GENERIC_MATH1I(FUN, CLANG_INTRIN, MSVC_INTRIN) _GENERIC_MATH1_BASE(FUN, double, _CSTD FUN)
#endif // ^^^ intrinsics unavailable ^^^

Expand All @@ -630,7 +630,7 @@ _STD _Common_float_type_t<_Ty1, _Ty2> remquo(_Ty1 _Left, _Ty2 _Right, int* _Pquo
#define _GENERIC_MATH2I(FUN, CLANG_INTRIN, MSVC_INTRIN) _GENERIC_MATH2_BASE(FUN, MSVC_INTRIN)
#elif defined(__clang__)
#define _GENERIC_MATH2I(FUN, CLANG_INTRIN, MSVC_INTRIN) _GENERIC_MATH2_BASE(FUN, CLANG_INTRIN)
#else // ^^^ defined(__clang__) ^^^ / vvv intrinsics unavailable vvv
#else // ^^^ defined(__clang__) / intrinsics unavailable vvv
#define _GENERIC_MATH2I(FUN, CLANG_INTRIN, MSVC_INTRIN) _GENERIC_MATH2_BASE(FUN, _CSTD FUN)
#endif // ^^^ intrinsics unavailable ^^^

Expand Down
2 changes: 1 addition & 1 deletion stl/inc/coroutine
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
_EMIT_STL_WARNING(STL4039, "The contents of <coroutine> are not available with /await. "
"Remove /await or use /await:strict for standard coroutines. "
"Use <experimental/coroutine> for legacy /await support.");
#else // ^^^ /await ^^^ / vvv no /await vvv
#else // ^^^ /await / no /await vvv
#ifndef __cpp_lib_coroutine
_EMIT_STL_WARNING(STL4038, "The contents of <coroutine> are available only with C++20 or later or /await:strict.");
#else // ^^^ <coroutine> is not available / <coroutine> is available vvv
Expand Down
6 changes: 3 additions & 3 deletions stl/inc/deque
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ public:
_NODISCARD strong_ordering operator<=>(const _Deque_unchecked_const_iterator& _Right) const noexcept {
return _Myoff <=> _Right._Myoff;
}
#else // ^^^ _HAS_CXX20 ^^^ / vvv !_HAS_CXX20 vvv
#else // ^^^ _HAS_CXX20 / !_HAS_CXX20 vvv
_NODISCARD bool operator!=(const _Deque_unchecked_const_iterator& _Right) const noexcept {
return !(*this == _Right);
}
Expand Down Expand Up @@ -363,7 +363,7 @@ public:
_Compat(_Right);
return this->_Myoff <=> _Right._Myoff;
}
#else // ^^^ _HAS_CXX20 ^^^ / vvv !_HAS_CXX20 vvv
#else // ^^^ _HAS_CXX20 / !_HAS_CXX20 vvv
_NODISCARD bool operator!=(const _Deque_const_iterator& _Right) const noexcept {
return !(*this == _Right);
}
Expand Down Expand Up @@ -407,7 +407,7 @@ public:
void _Verify_offset(const difference_type _Off) const noexcept {
#if _ITERATOR_DEBUG_LEVEL == 0
(void) _Off;
#else // ^^^ _ITERATOR_DEBUG_LEVEL == 0 ^^^ // vvv _ITERATOR_DEBUG_LEVEL != 0 vvv
#else // ^^^ _ITERATOR_DEBUG_LEVEL == 0 / _ITERATOR_DEBUG_LEVEL != 0 vvv
if (_Off != 0) {
const auto _Mycont = static_cast<const _Mydeque*>(this->_Getcont());
_STL_VERIFY(_Mycont, "cannot use value-initialized deque iterator");
Expand Down
4 changes: 2 additions & 2 deletions stl/inc/execution
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ _EXTERN_C
using __std_TP_WORK = void;
using __std_TP_CALLBACK_INSTANCE = void;
using __std_TP_CALLBACK_ENVIRON = void;
#else // ^^^ _M_CEE ^^^ // vvv !_M_CEE vvv
#else // ^^^ _M_CEE / !_M_CEE vvv
struct __std_TP_WORK; // not defined
struct __std_TP_CALLBACK_INSTANCE; // not defined
struct __std_TP_CALLBACK_ENVIRON; // not defined
Expand Down Expand Up @@ -2811,7 +2811,7 @@ inline size_t _Get_stable_sort_tree_height(const size_t _Count, const size_t _Hw
const size_t _Log_ideal_chunks = _Floor_of_log_2(_Ideal_chunks);
#ifdef _WIN64
const size_t _Max_tree_height = 62; // to avoid ptrdiff_t overflow
#else // ^^^ _WIN64 ^^^ // vvv !_WIN64 vvv
#else // ^^^ _WIN64 / !_WIN64 vvv
const size_t _Max_tree_height = 30;
#endif // _WIN64
const size_t _Clamped_ideal_chunks = (_STD min)(_Max_tree_height, _Log_ideal_chunks);
Expand Down
4 changes: 2 additions & 2 deletions stl/inc/forward_list
Original file line number Diff line number Diff line change
Expand Up @@ -1462,7 +1462,7 @@ private:
// splice _Right (_Prev, _Prev + 2) after _Where
#if _ITERATOR_DEBUG_LEVEL == 0
(void) _Right;
#else // ^^^ _ITERATOR_DEBUG_LEVEL == 0 // _ITERATOR_DEBUG_LEVEL != 0 vvv
#else // ^^^ _ITERATOR_DEBUG_LEVEL == 0 / _ITERATOR_DEBUG_LEVEL != 0 vvv
if constexpr (!_Alnode_traits::is_always_equal::value) {
_STL_VERIFY(_Getal() == _Right._Getal(), "forward_list containers incompatible for splice_after");
}
Expand Down Expand Up @@ -1491,7 +1491,7 @@ private:
// splice _Right (_First, _Last) just after _Where
#if _ITERATOR_DEBUG_LEVEL == 0
(void) _Right;
#else // ^^^ _ITERATOR_DEBUG_LEVEL == 0 // _ITERATOR_DEBUG_LEVEL != 0 vvv
#else // ^^^ _ITERATOR_DEBUG_LEVEL == 0 / _ITERATOR_DEBUG_LEVEL != 0 vvv
if constexpr (!_Alnode_traits::is_always_equal::value) {
_STL_VERIFY(_Getal() == _Right._Getal(), "forward_list containers incompatible for splice_after");
}
Expand Down
6 changes: 3 additions & 3 deletions stl/inc/iterator
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ public:
#ifdef __cpp_lib_concepts
using difference_type = ptrdiff_t;
using _Wrapped_iter = ranges::iterator_t<_Container>;
#else // ^^^ implementing Ranges // no Ranges vvv
#else // ^^^ implementing Ranges / no Ranges vvv
using difference_type = void;
using _Wrapped_iter = typename _Container::iterator;
#endif // __cpp_lib_concepts
Expand Down Expand Up @@ -1590,7 +1590,7 @@ public:
"cannot compare incompatible checked_array_iterators");
return _Myindex <=> _Right._Myindex;
}
#else // ^^^ _HAS_CXX20 ^^^ / vvv !_HAS_CXX20 vvv
#else // ^^^ _HAS_CXX20 / !_HAS_CXX20 vvv
_NODISCARD constexpr bool operator!=(const checked_array_iterator& _Right) const noexcept {
return !(*this == _Right);
}
Expand Down Expand Up @@ -1746,7 +1746,7 @@ public:
_NODISCARD constexpr _STD strong_ordering operator<=>(const unchecked_array_iterator& _Right) const noexcept {
return _Myptr <=> _Right._Myptr;
}
#else // ^^^ _HAS_CXX20 ^^^ / vvv !_HAS_CXX20 vvv
#else // ^^^ _HAS_CXX20 / !_HAS_CXX20 vvv
_NODISCARD constexpr bool operator!=(const unchecked_array_iterator& _Right) const noexcept {
return !(*this == _Right);
}
Expand Down
12 changes: 6 additions & 6 deletions stl/inc/limits
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#if (defined(_M_ARM64) || defined(_M_ARM64EC)) && !defined(_M_CEE_PURE) && !defined(__CUDACC__) \
&& !defined(__INTEL_COMPILER) && !defined(__clang__) // TRANSITION, LLVM-51488
#define _HAS_NEON_INTRINSICS 1
#else // ^^^ intrinsics available ^^^ / vvv intrinsics unavailable vvv
#else // ^^^ intrinsics available / intrinsics unavailable vvv
#define _HAS_NEON_INTRINSICS 0
#endif // ^^^ intrinsics unavailable ^^^

Expand Down Expand Up @@ -1054,7 +1054,7 @@ _NODISCARD constexpr int _Popcount_fallback(_Ty _Val) noexcept {
#if (defined(_M_IX86) || (defined(_M_X64) && !defined(_M_ARM64EC))) && !defined(_M_CEE_PURE) && !defined(__CUDACC__) \
&& !defined(__INTEL_COMPILER)
#define _HAS_TZCNT_BSF_INTRINSICS 1
#else // ^^^ intrinsics available ^^^ / vvv intrinsics unavailable vvv
#else // ^^^ intrinsics available / intrinsics unavailable vvv
#define _HAS_TZCNT_BSF_INTRINSICS 0
#endif // ^^^ intrinsics unavailable ^^^

Expand Down Expand Up @@ -1153,7 +1153,7 @@ _NODISCARD int _Checked_x86_x64_countr_zero(const _Ty _Val) noexcept {
#if (defined(_M_IX86) || (defined(_M_X64) && !defined(_M_ARM64EC))) && !defined(_M_CEE_PURE) && !defined(__CUDACC__) \
&& !defined(__INTEL_COMPILER)
#define _HAS_POPCNT_INTRINSICS 1
#else // ^^^ intrinsics available ^^^ / vvv intrinsics unavailable vvv
#else // ^^^ intrinsics available / intrinsics unavailable vvv
#define _HAS_POPCNT_INTRINSICS 0
#endif // ^^^ intrinsics unavailable ^^^

Expand Down Expand Up @@ -1217,7 +1217,7 @@ constexpr decltype(auto) _Select_countr_zero_impl(_Fn _Callback) {
if (!_STD is_constant_evaluated()) {
#ifdef __AVX2__
return _Callback([](_Ty _Val) { return _Countr_zero_tzcnt(_Val); });
#else // ^^^ AVX2 ^^^ / vvv not AVX2 vvv
#else // ^^^ AVX2 / not AVX2 vvv
const bool _Definitely_have_tzcnt = __isa_available >= __ISA_AVAILABLE_AVX2;
if (_Definitely_have_tzcnt) {
return _Callback([](_Ty _Val) { return _Countr_zero_tzcnt(_Val); });
Expand All @@ -1240,7 +1240,7 @@ _NODISCARD _CONSTEXPR20 int _Popcount(const _Ty _Val) noexcept {
{
#if _HAS_POPCNT_INTRINSICS
return _Checked_x86_x64_popcount(_Val);
#elif _HAS_NEON_INTRINSICS // ^^^ x86/x64 intrinsics available ^^^ / vvv ARM64 intrinsics available vvv
#elif _HAS_NEON_INTRINSICS // ^^^ x86/x64 intrinsics available / ARM64 intrinsics available vvv
return _Arm64_popcount(_Val);
#endif // ^^^ ARM64 intrinsics available ^^^
}
Expand All @@ -1264,7 +1264,7 @@ _CONSTEXPR20 decltype(auto) _Select_popcount_impl(_Fn _Callback) {
}
#endif // !defined(__AVX__)
return _Callback([](_Ty _Val) { return _Unchecked_x86_x64_popcount(_Val); });
#elif _HAS_NEON_INTRINSICS // ^^^ x86/x64 intrinsics available ^^^ / vvv ARM64 intrinsics available vvv
#elif _HAS_NEON_INTRINSICS // ^^^ x86/x64 intrinsics available / ARM64 intrinsics available vvv
return _Callback([](_Ty _Val) { return _Arm64_popcount(_Val); });
#endif // ^^^ ARM64 intrinsics available ^^^
}
Expand Down
6 changes: 3 additions & 3 deletions stl/inc/list
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ public:
*_Pnext = *_Pnextnext;
}
}
#else // ^^^ _ITERATOR_DEBUG_LEVEL == 2 ^^^ // vvv _ITERATOR_DEBUG_LEVEL != 2 vvv
#else // ^^^ _ITERATOR_DEBUG_LEVEL == 2 / _ITERATOR_DEBUG_LEVEL != 2 vvv
(void) _Ptr;
#endif // _ITERATOR_DEBUG_LEVEL == 2
}
Expand Down Expand Up @@ -981,7 +981,7 @@ public:

#if _HAS_CXX17
return _Result;
#else // ^^^ _HAS_CXX17 // !_HAS_CXX17 vvv
#else // ^^^ _HAS_CXX17 / !_HAS_CXX17 vvv
(void) _Result;
#endif // _HAS_CXX17
}
Expand All @@ -992,7 +992,7 @@ public:

#if _HAS_CXX17
return _Result;
#else // ^^^ _HAS_CXX17 // !_HAS_CXX17 vvv
#else // ^^^ _HAS_CXX17 / !_HAS_CXX17 vvv
(void) _Result;
#endif // _HAS_CXX17
}
Expand Down
2 changes: 1 addition & 1 deletion stl/inc/new
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ _NODISCARD_LAUNDER constexpr _Ty* launder(_Ty* _Ptr) noexcept {
#if defined(_M_IX86) || defined(_M_X64) || defined(_M_ARM) || defined(_M_ARM64)
_EXPORT_STD inline constexpr size_t hardware_constructive_interference_size = 64;
_EXPORT_STD inline constexpr size_t hardware_destructive_interference_size = 64;
#else // ^^^ supported hardware ^^^ // vvv unsupported hardware vvv
#else // ^^^ supported hardware / unsupported hardware vvv
#error Unsupported architecture
#endif // hardware

Expand Down
Loading