Skip to content
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
6 changes: 1 addition & 5 deletions stl/inc/yvals_core.h
Original file line number Diff line number Diff line change
Expand Up @@ -1694,11 +1694,7 @@ _EMIT_STL_ERROR(STL1004, "C++98 unexpected() is incompatible with C++23 unexpect
// C++23
#if _HAS_CXX23
#define __cpp_lib_adaptor_iterator_pair_constructor 202106L

#ifdef __cpp_lib_concepts
#define __cpp_lib_allocate_at_least 202106L
#endif // __cpp_lib_concepts

#define __cpp_lib_allocate_at_least 202302L
#define __cpp_lib_associative_heterogeneous_erasure 202110L
#define __cpp_lib_bind_back 202202L
#define __cpp_lib_byteswap 202110L
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@ STATIC_ASSERT(__cpp_lib_algorithm_iterator_requirements == 202207L);
#endif
#endif

#if _HAS_CXX23 && defined(__cpp_lib_concepts) // TRANSITION, GH-395
#if _HAS_CXX23
#ifndef __cpp_lib_allocate_at_least
#error __cpp_lib_allocate_at_least is not defined
#elif __cpp_lib_allocate_at_least != 202106L
#error __cpp_lib_allocate_at_least is not 202106L
#elif __cpp_lib_allocate_at_least != 202302L
#error __cpp_lib_allocate_at_least is not 202302L
#else
STATIC_ASSERT(__cpp_lib_allocate_at_least == 202106L);
STATIC_ASSERT(__cpp_lib_allocate_at_least == 202302L);
#endif
#else
#ifdef __cpp_lib_allocate_at_least
Expand Down