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.

Sign up for GitHub

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

Test coarse-grained _HAS_CXXnn instead of fine-grained __cpp_lib_MEOW #4364

Merged
merged 6 commits into from
Feb 6, 2024
Merged

Test coarse-grained _HAS_CXXnn instead of fine-grained __cpp_lib_MEOW #4364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a06ced8
__cpp_lib_print => _HAS_CXX23
cpplearner Feb 3, 2024
aa6f3c0
__cpp_lib_ranges => _HAS_CXX20
cpplearner Feb 3, 2024
29b09b1
__cpp_lib_shift >= 202202L => _HAS_CXX23
cpplearner Feb 3, 2024
9dfac90
__cpp_lib_ranges_to_container
cpplearner Feb 3, 2024
d017bd0
__cpp_lib_move_only_function => _HAS_CXX23
cpplearner Feb 3, 2024
13dd66e
__cpp_lib_stacktrace => _HAS_CXX23
cpplearner Feb 3, 2024
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/__msvc_filebuf.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ class basic_filebuf : public basic_streambuf<_Elem, _Traits> { // stream buffer
}
}

#if defined(__cpp_lib_print) && defined(_CPPRTTI)
#if _HAS_CXX23 && defined(_CPPRTTI)
template <class _Filebuf_type>
friend ios_base::iostate _Print_noformat_unicode(ostream&, string_view);
#endif
Expand Down
8 changes: 4 additions & 4 deletions stl/inc/ostream
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
#if _STL_COMPILER_PREPROCESSOR
#include <ios>

#ifdef __cpp_lib_print
#if _HAS_CXX23
#include <__msvc_filebuf.hpp>
#include <__msvc_print.hpp>
#include <format>
#endif // ^^^ defined(__cpp_lib_print) ^^^
#endif // ^^^ _HAS_CXX23 ^^^

#pragma pack(push, _CRT_PACKING)
#pragma warning(push, _STL_WARNING_LEVEL)
Expand Down Expand Up @@ -1088,7 +1088,7 @@ basic_ostream<_Elem, _Traits>& operator<<(basic_ostream<_Elem, _Traits>& _Ostr,
return _Ostr << _Errcode.category().name() << ':' << _Errcode.value();
}

#ifdef __cpp_lib_print
#if _HAS_CXX23
#ifdef _CPPRTTI
template <int = 0>
ios_base::iostate _Print_noformat_nonunicode(ostream& _Ostr, const string_view _Str) {
Expand Down Expand Up @@ -1289,7 +1289,7 @@ void println(ostream&, format_string<_Types...>, _Types&&...) = delete; // requi
_EXPORT_STD void vprint_unicode(ostream&, string_view, format_args) = delete; // requires /GR option
_EXPORT_STD void vprint_nonunicode(ostream&, string_view, format_args) = delete; // requires /GR option
#endif // ^^^ !defined(_CPPRTTI) ^^^
#endif // defined(__cpp_lib_print)
#endif // _HAS_CXX23

_STD_END

Expand Down
6 changes: 3 additions & 3 deletions stl/inc/print
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
#define _PRINT_
#include <yvals_core.h>
#if _STL_COMPILER_PREPROCESSOR
#ifndef __cpp_lib_print
#if !_HAS_CXX23
_EMIT_STL_WARNING(STL4038, "The contents of <print> are available only with C++23 or later.");
#else // ^^^ !defined(__cpp_lib_print) / defined(__cpp_lib_print) vvv
#else // ^^^ !_HAS_CXX23 / _HAS_CXX23 vvv

#include <__msvc_print.hpp>
#include <cstdio>
Expand Down Expand Up @@ -163,6 +163,6 @@ _STL_RESTORE_CLANG_WARNINGS
#pragma warning(pop)
#pragma pack(pop)

#endif // ^^^ defined(__cpp_lib_print) ^^^
#endif // ^^^ _HAS_CXX23 ^^^
#endif // _STL_COMPILER_PREPROCESSOR
#endif // _PRINT_
8 changes: 3 additions & 5 deletions stl/inc/ranges
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
#define _RANGES_
#include <yvals_core.h>
#if _STL_COMPILER_PREPROCESSOR
#ifndef __cpp_lib_ranges
#if !_HAS_CXX20
_EMIT_STL_WARNING(STL4038, "The contents of <ranges> are available only with C++20 or later.");
#else // ^^^ !defined(__cpp_lib_ranges) / defined(__cpp_lib_ranges) vvv
#else // ^^^ !_HAS_CXX20 / _HAS_CXX20 vvv
#include <__msvc_int128.hpp>
#include <iosfwd>
#include <iterator>
Expand Down Expand Up @@ -10261,7 +10261,6 @@ namespace ranges {
_EXPORT_STD inline constexpr _Cartesian_product_fn cartesian_product;
} // namespace views

#ifdef __cpp_lib_ranges_to_container
template <class _Range, class _Container>
concept _Sized_and_reservable = sized_range<_Range> && sized_range<_Container>
&& requires(_Container& _Cont, const range_size_t<_Container> _Count) {
Expand Down Expand Up @@ -10415,7 +10414,6 @@ namespace ranges {
_NODISCARD constexpr auto to(_Types&&... _Args) {
return _Range_closure<_To_template_fn<_Container>, decay_t<_Types>...>{_STD forward<_Types>(_Args)...};
}
#endif // defined(__cpp_lib_ranges_to_container)
#endif // _HAS_CXX23
} // namespace ranges

Expand All @@ -10427,6 +10425,6 @@ _STD_END
_STL_RESTORE_CLANG_WARNINGS
#pragma warning(pop)
#pragma pack(pop)
#endif // ^^^ defined(__cpp_lib_ranges) ^^^
#endif // ^^^ _HAS_CXX20 ^^^
#endif // _STL_COMPILER_PREPROCESSOR
#endif // _RANGES_
8 changes: 4 additions & 4 deletions tests/std/tests/Dev11_0000000_tuple_cat/test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
#include <type_traits>
#include <utility>

#ifdef __cpp_lib_ranges
#if _HAS_CXX20
#include <iterator>
#include <list>
#include <ranges>
#include <vector>
#endif // __cpp_lib_ranges
#endif // _HAS_CXX20

using namespace std;

Expand Down Expand Up @@ -231,7 +231,7 @@ int main() {
}
}

#ifdef __cpp_lib_ranges
#if _HAS_CXX20
{
using ranges::subrange, ranges::subrange_kind;

Expand All @@ -252,7 +252,7 @@ int main() {
STATIC_ASSERT(is_same_v<decltype(cat7), tuple<LstIter, LstIter, VecIter, VecConstIter>>);
assert(cat7 == make_tuple(next(lst.begin()), prev(lst.end()), vec.begin() + 1, vec.cend() - 1));
}
#endif // __cpp_lib_ranges
#endif // _HAS_CXX20

// Also test C++17 apply() and make_from_tuple().
#if _HAS_CXX17
Expand Down
4 changes: 2 additions & 2 deletions tests/std/tests/GH_000545_include_compare/test_stacktrace.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

#include <version>
#ifdef __cpp_lib_stacktrace
#if _HAS_CXX23

#include <stacktrace>

// Testing LWG-3330 "Include <compare> from most library headers" by intentionally NOT including <compare>

static_assert(std::is_eq(std::partial_ordering::equivalent));

#endif // __cpp_lib_stacktrace
#endif // _HAS_CXX23

void test_stacktrace() {}
2 changes: 1 addition & 1 deletion tests/std/tests/GH_000690_overaligned_function/test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ void test() {

int main() {
test<std::function<void(const void* storage, std::size_t storage_size)>>();
#ifdef __cpp_lib_move_only_function
#if _HAS_CXX23
test<std::move_only_function<void(const void* storage, std::size_t storage_size)>>();
#endif
}
4 changes: 2 additions & 2 deletions tests/std/tests/GH_001411_core_headers/test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@ void test_gh_2699() {
assert(cats[1] == 50);
assert(dogs[1] == 20);

#ifdef __cpp_lib_ranges
#if _HAS_CXX20
std::ranges::swap(cats, dogs);
assert(cats[1] == 20);
assert(dogs[1] == 50);
#endif // __cpp_lib_ranges
#endif // _HAS_CXX20
}

int main() {
Expand Down
16 changes: 8 additions & 8 deletions tests/std/tests/P0769R2_shift_left_shift_right/test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ void test_case_shift_left(const ptrdiff_t tmpSize) {
fill_iota(tmp, tmpSize);
test_iota(tmp.begin(), shift_left(tmp.begin(), tmp.end(), pos_to_shift), pos_to_shift + 1, tmpSize);

#if __cpp_lib_shift >= 202202L
#if _HAS_CXX23
{
fill_iota(tmp, tmpSize);
auto [first, last] = ranges::shift_left(tmp.begin(), tmp.end(), pos_to_shift);
Expand All @@ -119,15 +119,15 @@ void test_case_shift_left(const ptrdiff_t tmpSize) {
assert(first == tmp.begin());
test_iota(first, last, pos_to_shift + 1, tmpSize);
}
#endif // __cpp_lib_shift >= 202202L
#endif // _HAS_CXX23
}

fill_iota(tmp, tmpSize);
for (int i = 0; i < 3; ++i) {
test_iota(shift_left(tmp.begin(), tmp.end(), tmpSize + i), tmp.end(), 1, tmpSize);
}

#if __cpp_lib_shift >= 202202L
#if _HAS_CXX23
fill_iota(tmp, tmpSize);
for (int i = 0; i < 3; ++i) {
auto [first, last] = ranges::shift_left(tmp.begin(), tmp.end(), tmpSize + i);
Expand All @@ -141,7 +141,7 @@ void test_case_shift_left(const ptrdiff_t tmpSize) {
assert(first == tmp.begin());
test_iota(last, tmp.end(), 1, tmpSize);
}
#endif // __cpp_lib_shift >= 202202L
#endif // _HAS_CXX23
}

template <typename Container>
Expand All @@ -153,7 +153,7 @@ void test_case_shift_right(const ptrdiff_t tmpSize) {
fill_iota(tmp, tmpSize);
test_iota(shift_right(tmp.begin(), tmp.end(), pos_to_shift), tmp.end(), 1, tmpSize - pos_to_shift);

#if __cpp_lib_shift >= 202202L
#if _HAS_CXX23
{
fill_iota(tmp, tmpSize);
auto [first, last] = ranges::shift_right(tmp.begin(), tmp.end(), pos_to_shift);
Expand All @@ -167,15 +167,15 @@ void test_case_shift_right(const ptrdiff_t tmpSize) {
assert(last == tmp.end());
test_iota(first, last, 1, tmpSize - pos_to_shift);
}
#endif // __cpp_lib_shift >= 202202L
#endif // _HAS_CXX23
}

fill_iota(tmp, tmpSize);
for (int i = 0; i < 3; ++i) {
test_iota(tmp.begin(), shift_right(tmp.begin(), tmp.end(), tmpSize + i), 1, tmpSize);
}

#if __cpp_lib_shift >= 202202L
#if _HAS_CXX23
fill_iota(tmp, tmpSize);
for (int i = 0; i < 3; ++i) {
auto [first, last] = ranges::shift_right(tmp.begin(), tmp.end(), tmpSize + i);
Expand All @@ -189,7 +189,7 @@ void test_case_shift_right(const ptrdiff_t tmpSize) {
assert(last == tmp.end());
test_iota(tmp.begin(), first, 1, tmpSize);
}
#endif // __cpp_lib_shift >= 202202L
#endif // _HAS_CXX23
}

int main() {
Expand Down