Index: libcxx/docs/FeatureTestMacroTable.rst =================================================================== --- libcxx/docs/FeatureTestMacroTable.rst +++ libcxx/docs/FeatureTestMacroTable.rst @@ -227,5 +227,9 @@ ``__cpp_lib_three_way_comparison`` *unimplemented* ------------------------------------------------- ----------------- ``__cpp_lib_to_array`` ``201907L`` + ------------------------------------------------- ----------------- + **C++ 2b** + ------------------------------------------------------------------- + ``__cpp_lib_string_contains`` ``202011L`` ================================================= ================= Index: libcxx/include/string =================================================================== --- libcxx/include/string +++ libcxx/include/string @@ -324,6 +324,10 @@ bool ends_with(charT c) const noexcept; // C++20 bool ends_with(const charT* s) const; // C++20 + bool contains(basic_string_view sv) const noexcept; // C++2b + bool contains(charT c) const noexcept; // C++2b + bool contains(const charT* s) const; // C++2b + bool __invariants() const; }; @@ -1433,6 +1437,20 @@ { return ends_with(__self_view(__s)); } #endif +#if _LIBCPP_STD_VER > 20 + _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY + bool contains(__self_view __sv) const _NOEXCEPT + { return __self_view(data(), size()).contains(__sv); } + + _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY + bool contains(value_type __c) const _NOEXCEPT + { return __self_view(data(), size()).contains(__c); } + + _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY + bool contains(const value_type* __s) const _NOEXCEPT + { return __self_view(data(), size()).contains(__s); } +#endif + _LIBCPP_INLINE_VISIBILITY bool __invariants() const; _LIBCPP_INLINE_VISIBILITY void __clear_and_shrink() _NOEXCEPT; Index: libcxx/include/string_view =================================================================== --- libcxx/include/string_view +++ libcxx/include/string_view @@ -149,6 +149,10 @@ constexpr bool ends_with(charT c) const noexcept; // C++20 constexpr bool ends_with(const charT* s) const; // C++20 + constexpr bool contains(basic_string_view s) const noexcept; // C++2b + constexpr bool contains(charT c) const noexcept; // C++2b + constexpr bool contains(const charT* s) const; // C++2b + private: const_pointer data_; // exposition only size_type size_; // exposition only @@ -622,6 +626,20 @@ { return ends_with(basic_string_view(__s)); } #endif +#if _LIBCPP_STD_VER > 20 + _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY + bool contains(basic_string_view __sv) const _NOEXCEPT + { return find(__sv) != npos; } + + _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY + bool contains(value_type __c) const _NOEXCEPT + { return find(__c) != npos; } + + _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY + bool contains(const value_type* __s) const _NOEXCEPT + { return find(__s) != npos; } +#endif + private: const value_type* __data; size_type __size; Index: libcxx/include/version =================================================================== --- libcxx/include/version +++ libcxx/include/version @@ -110,6 +110,7 @@ __cpp_lib_shared_ptr_weak_type 201606L __cpp_lib_shared_timed_mutex 201402L __cpp_lib_span 202002L +__cpp_lib_string_contains 202011L __cpp_lib_string_udls 201304L __cpp_lib_string_view 201606L __cpp_lib_three_way_comparison 201711L @@ -278,4 +279,8 @@ # define __cpp_lib_to_array 201907L #endif +#if _LIBCPP_STD_VER > 20 +# define __cpp_lib_string_contains 202011L +#endif + #endif // _LIBCPP_VERSIONH Index: libcxx/test/std/language.support/support.limits/support.limits.general/algorithm.version.pass.cpp =================================================================== --- libcxx/test/std/language.support/support.limits/support.limits.general/algorithm.version.pass.cpp +++ libcxx/test/std/language.support/support.limits/support.limits.general/algorithm.version.pass.cpp @@ -186,6 +186,68 @@ # error "__cpp_lib_sample should have the value 201603L in c++20" # endif -#endif // TEST_STD_VER == 20 +#elif TEST_STD_VER > 20 + +# ifndef __cpp_lib_clamp +# error "__cpp_lib_clamp should be defined in c++2b" +# endif +# if __cpp_lib_clamp != 201603L +# error "__cpp_lib_clamp should have the value 201603L in c++2b" +# endif + +# if !defined(_LIBCPP_VERSION) +# ifndef __cpp_lib_constexpr_swap_algorithms +# error "__cpp_lib_constexpr_swap_algorithms should be defined in c++2b" +# endif +# if __cpp_lib_constexpr_swap_algorithms != 201806L +# error "__cpp_lib_constexpr_swap_algorithms should have the value 201806L in c++2b" +# endif +# else // _LIBCPP_VERSION +# ifdef __cpp_lib_constexpr_swap_algorithms +# error "__cpp_lib_constexpr_swap_algorithms should not be defined because it is unimplemented in libc++!" +# endif +# endif + +# if !defined(_LIBCPP_VERSION) +# ifndef __cpp_lib_parallel_algorithm +# error "__cpp_lib_parallel_algorithm should be defined in c++2b" +# endif +# if __cpp_lib_parallel_algorithm != 201603L +# error "__cpp_lib_parallel_algorithm should have the value 201603L in c++2b" +# endif +# else // _LIBCPP_VERSION +# ifdef __cpp_lib_parallel_algorithm +# error "__cpp_lib_parallel_algorithm should not be defined because it is unimplemented in libc++!" +# endif +# endif + +# if !defined(_LIBCPP_VERSION) +# ifndef __cpp_lib_ranges +# error "__cpp_lib_ranges should be defined in c++2b" +# endif +# if __cpp_lib_ranges != 201811L +# error "__cpp_lib_ranges should have the value 201811L in c++2b" +# endif +# else // _LIBCPP_VERSION +# ifdef __cpp_lib_ranges +# error "__cpp_lib_ranges should not be defined because it is unimplemented in libc++!" +# endif +# endif + +# ifndef __cpp_lib_robust_nonmodifying_seq_ops +# error "__cpp_lib_robust_nonmodifying_seq_ops should be defined in c++2b" +# endif +# if __cpp_lib_robust_nonmodifying_seq_ops != 201304L +# error "__cpp_lib_robust_nonmodifying_seq_ops should have the value 201304L in c++2b" +# endif + +# ifndef __cpp_lib_sample +# error "__cpp_lib_sample should be defined in c++2b" +# endif +# if __cpp_lib_sample != 201603L +# error "__cpp_lib_sample should have the value 201603L in c++2b" +# endif + +#endif // TEST_STD_VER > 20 int main(int, char**) { return 0; } Index: libcxx/test/std/language.support/support.limits/support.limits.general/any.version.pass.cpp =================================================================== --- libcxx/test/std/language.support/support.limits/support.limits.general/any.version.pass.cpp +++ libcxx/test/std/language.support/support.limits/support.limits.general/any.version.pass.cpp @@ -50,6 +50,15 @@ # error "__cpp_lib_any should have the value 201606L in c++20" # endif -#endif // TEST_STD_VER == 20 +#elif TEST_STD_VER > 20 + +# ifndef __cpp_lib_any +# error "__cpp_lib_any should be defined in c++2b" +# endif +# if __cpp_lib_any != 201606L +# error "__cpp_lib_any should have the value 201606L in c++2b" +# endif + +#endif // TEST_STD_VER > 20 int main(int, char**) { return 0; } Index: libcxx/test/std/language.support/support.limits/support.limits.general/array.version.pass.cpp =================================================================== --- libcxx/test/std/language.support/support.limits/support.limits.general/array.version.pass.cpp +++ libcxx/test/std/language.support/support.limits/support.limits.general/array.version.pass.cpp @@ -94,6 +94,29 @@ # error "__cpp_lib_to_array should have the value 201907L in c++20" # endif -#endif // TEST_STD_VER == 20 +#elif TEST_STD_VER > 20 + +# ifndef __cpp_lib_array_constexpr +# error "__cpp_lib_array_constexpr should be defined in c++2b" +# endif +# if __cpp_lib_array_constexpr != 201811L +# error "__cpp_lib_array_constexpr should have the value 201811L in c++2b" +# endif + +# ifndef __cpp_lib_nonmember_container_access +# error "__cpp_lib_nonmember_container_access should be defined in c++2b" +# endif +# if __cpp_lib_nonmember_container_access != 201411L +# error "__cpp_lib_nonmember_container_access should have the value 201411L in c++2b" +# endif + +# ifndef __cpp_lib_to_array +# error "__cpp_lib_to_array should be defined in c++2b" +# endif +# if __cpp_lib_to_array != 201907L +# error "__cpp_lib_to_array should have the value 201907L in c++2b" +# endif + +#endif // TEST_STD_VER > 20 int main(int, char**) { return 0; } Index: libcxx/test/std/language.support/support.limits/support.limits.general/atomic.version.pass.cpp =================================================================== --- libcxx/test/std/language.support/support.limits/support.limits.general/atomic.version.pass.cpp +++ libcxx/test/std/language.support/support.limits/support.limits.general/atomic.version.pass.cpp @@ -272,6 +272,125 @@ # endif # endif -#endif // TEST_STD_VER == 20 +#elif TEST_STD_VER > 20 + +# if !defined(_LIBCPP_HAS_NO_THREADS) +# ifndef __cpp_lib_atomic_flag_test +# error "__cpp_lib_atomic_flag_test should be defined in c++2b" +# endif +# if __cpp_lib_atomic_flag_test != 201907L +# error "__cpp_lib_atomic_flag_test should have the value 201907L in c++2b" +# endif +# else +# ifdef __cpp_lib_atomic_flag_test +# error "__cpp_lib_atomic_flag_test should not be defined when !defined(_LIBCPP_HAS_NO_THREADS) is not defined!" +# endif +# endif + +# if !defined(_LIBCPP_VERSION) +# ifndef __cpp_lib_atomic_float +# error "__cpp_lib_atomic_float should be defined in c++2b" +# endif +# if __cpp_lib_atomic_float != 201711L +# error "__cpp_lib_atomic_float should have the value 201711L in c++2b" +# endif +# else // _LIBCPP_VERSION +# ifdef __cpp_lib_atomic_float +# error "__cpp_lib_atomic_float should not be defined because it is unimplemented in libc++!" +# endif +# endif + +# if !defined(_LIBCPP_HAS_NO_THREADS) +# ifndef __cpp_lib_atomic_is_always_lock_free +# error "__cpp_lib_atomic_is_always_lock_free should be defined in c++2b" +# endif +# if __cpp_lib_atomic_is_always_lock_free != 201603L +# error "__cpp_lib_atomic_is_always_lock_free should have the value 201603L in c++2b" +# endif +# else +# ifdef __cpp_lib_atomic_is_always_lock_free +# error "__cpp_lib_atomic_is_always_lock_free should not be defined when !defined(_LIBCPP_HAS_NO_THREADS) is not defined!" +# endif +# endif + +# if !defined(_LIBCPP_HAS_NO_THREADS) +# ifndef __cpp_lib_atomic_lock_free_type_aliases +# error "__cpp_lib_atomic_lock_free_type_aliases should be defined in c++2b" +# endif +# if __cpp_lib_atomic_lock_free_type_aliases != 201907L +# error "__cpp_lib_atomic_lock_free_type_aliases should have the value 201907L in c++2b" +# endif +# else +# ifdef __cpp_lib_atomic_lock_free_type_aliases +# error "__cpp_lib_atomic_lock_free_type_aliases should not be defined when !defined(_LIBCPP_HAS_NO_THREADS) is not defined!" +# endif +# endif + +# if !defined(_LIBCPP_VERSION) +# ifndef __cpp_lib_atomic_ref +# error "__cpp_lib_atomic_ref should be defined in c++2b" +# endif +# if __cpp_lib_atomic_ref != 201806L +# error "__cpp_lib_atomic_ref should have the value 201806L in c++2b" +# endif +# else // _LIBCPP_VERSION +# ifdef __cpp_lib_atomic_ref +# error "__cpp_lib_atomic_ref should not be defined because it is unimplemented in libc++!" +# endif +# endif + +# if !defined(_LIBCPP_VERSION) +# ifndef __cpp_lib_atomic_shared_ptr +# error "__cpp_lib_atomic_shared_ptr should be defined in c++2b" +# endif +# if __cpp_lib_atomic_shared_ptr != 201711L +# error "__cpp_lib_atomic_shared_ptr should have the value 201711L in c++2b" +# endif +# else // _LIBCPP_VERSION +# ifdef __cpp_lib_atomic_shared_ptr +# error "__cpp_lib_atomic_shared_ptr should not be defined because it is unimplemented in libc++!" +# endif +# endif + +# if !defined(_LIBCPP_VERSION) +# ifndef __cpp_lib_atomic_value_initialization +# error "__cpp_lib_atomic_value_initialization should be defined in c++2b" +# endif +# if __cpp_lib_atomic_value_initialization != 201911L +# error "__cpp_lib_atomic_value_initialization should have the value 201911L in c++2b" +# endif +# else // _LIBCPP_VERSION +# ifdef __cpp_lib_atomic_value_initialization +# error "__cpp_lib_atomic_value_initialization should not be defined because it is unimplemented in libc++!" +# endif +# endif + +# if !defined(_LIBCPP_HAS_NO_THREADS) +# ifndef __cpp_lib_atomic_wait +# error "__cpp_lib_atomic_wait should be defined in c++2b" +# endif +# if __cpp_lib_atomic_wait != 201907L +# error "__cpp_lib_atomic_wait should have the value 201907L in c++2b" +# endif +# else +# ifdef __cpp_lib_atomic_wait +# error "__cpp_lib_atomic_wait should not be defined when !defined(_LIBCPP_HAS_NO_THREADS) is not defined!" +# endif +# endif + +# if defined(__cpp_char8_t) +# ifndef __cpp_lib_char8_t +# error "__cpp_lib_char8_t should be defined in c++2b" +# endif +# if __cpp_lib_char8_t != 201811L +# error "__cpp_lib_char8_t should have the value 201811L in c++2b" +# endif +# else +# ifdef __cpp_lib_char8_t +# error "__cpp_lib_char8_t should not be defined when defined(__cpp_char8_t) is not defined!" +# endif +# endif + +#endif // TEST_STD_VER > 20 int main(int, char**) { return 0; } Index: libcxx/test/std/language.support/support.limits/support.limits.general/bit.version.pass.cpp =================================================================== --- libcxx/test/std/language.support/support.limits/support.limits.general/bit.version.pass.cpp +++ libcxx/test/std/language.support/support.limits/support.limits.general/bit.version.pass.cpp @@ -93,6 +93,35 @@ # error "__cpp_lib_int_pow2 should have the value 202002L in c++20" # endif -#endif // TEST_STD_VER == 20 +#elif TEST_STD_VER > 20 + +# if !defined(_LIBCPP_VERSION) +# ifndef __cpp_lib_bit_cast +# error "__cpp_lib_bit_cast should be defined in c++2b" +# endif +# if __cpp_lib_bit_cast != 201806L +# error "__cpp_lib_bit_cast should have the value 201806L in c++2b" +# endif +# else // _LIBCPP_VERSION +# ifdef __cpp_lib_bit_cast +# error "__cpp_lib_bit_cast should not be defined because it is unimplemented in libc++!" +# endif +# endif + +# ifndef __cpp_lib_endian +# error "__cpp_lib_endian should be defined in c++2b" +# endif +# if __cpp_lib_endian != 201907L +# error "__cpp_lib_endian should have the value 201907L in c++2b" +# endif + +# ifndef __cpp_lib_int_pow2 +# error "__cpp_lib_int_pow2 should be defined in c++2b" +# endif +# if __cpp_lib_int_pow2 != 202002L +# error "__cpp_lib_int_pow2 should have the value 202002L in c++2b" +# endif + +#endif // TEST_STD_VER > 20 int main(int, char**) { return 0; } Index: libcxx/test/std/language.support/support.limits/support.limits.general/chrono.version.pass.cpp =================================================================== --- libcxx/test/std/language.support/support.limits/support.limits.general/chrono.version.pass.cpp +++ libcxx/test/std/language.support/support.limits/support.limits.general/chrono.version.pass.cpp @@ -76,6 +76,22 @@ # error "__cpp_lib_chrono_udls should have the value 201304L in c++20" # endif -#endif // TEST_STD_VER == 20 +#elif TEST_STD_VER > 20 + +# ifndef __cpp_lib_chrono +# error "__cpp_lib_chrono should be defined in c++2b" +# endif +# if __cpp_lib_chrono != 201611L +# error "__cpp_lib_chrono should have the value 201611L in c++2b" +# endif + +# ifndef __cpp_lib_chrono_udls +# error "__cpp_lib_chrono_udls should be defined in c++2b" +# endif +# if __cpp_lib_chrono_udls != 201304L +# error "__cpp_lib_chrono_udls should have the value 201304L in c++2b" +# endif + +#endif // TEST_STD_VER > 20 int main(int, char**) { return 0; } Index: libcxx/test/std/language.support/support.limits/support.limits.general/cmath.version.pass.cpp =================================================================== --- libcxx/test/std/language.support/support.limits/support.limits.general/cmath.version.pass.cpp +++ libcxx/test/std/language.support/support.limits/support.limits.general/cmath.version.pass.cpp @@ -85,6 +85,28 @@ # endif # endif -#endif // TEST_STD_VER == 20 +#elif TEST_STD_VER > 20 + +# ifndef __cpp_lib_hypot +# error "__cpp_lib_hypot should be defined in c++2b" +# endif +# if __cpp_lib_hypot != 201603L +# error "__cpp_lib_hypot should have the value 201603L in c++2b" +# endif + +# if !defined(_LIBCPP_VERSION) +# ifndef __cpp_lib_math_special_functions +# error "__cpp_lib_math_special_functions should be defined in c++2b" +# endif +# if __cpp_lib_math_special_functions != 201603L +# error "__cpp_lib_math_special_functions should have the value 201603L in c++2b" +# endif +# else // _LIBCPP_VERSION +# ifdef __cpp_lib_math_special_functions +# error "__cpp_lib_math_special_functions should not be defined because it is unimplemented in libc++!" +# endif +# endif + +#endif // TEST_STD_VER > 20 int main(int, char**) { return 0; } Index: libcxx/test/std/language.support/support.limits/support.limits.general/compare.version.pass.cpp =================================================================== --- libcxx/test/std/language.support/support.limits/support.limits.general/compare.version.pass.cpp +++ libcxx/test/std/language.support/support.limits/support.limits.general/compare.version.pass.cpp @@ -53,6 +53,21 @@ # endif # endif -#endif // TEST_STD_VER == 20 +#elif TEST_STD_VER > 20 + +# if !defined(_LIBCPP_VERSION) +# ifndef __cpp_lib_three_way_comparison +# error "__cpp_lib_three_way_comparison should be defined in c++2b" +# endif +# if __cpp_lib_three_way_comparison != 201711L +# error "__cpp_lib_three_way_comparison should have the value 201711L in c++2b" +# endif +# else // _LIBCPP_VERSION +# ifdef __cpp_lib_three_way_comparison +# error "__cpp_lib_three_way_comparison should not be defined because it is unimplemented in libc++!" +# endif +# endif + +#endif // TEST_STD_VER > 20 int main(int, char**) { return 0; } Index: libcxx/test/std/language.support/support.limits/support.limits.general/complex.version.pass.cpp =================================================================== --- libcxx/test/std/language.support/support.limits/support.limits.general/complex.version.pass.cpp +++ libcxx/test/std/language.support/support.limits/support.limits.general/complex.version.pass.cpp @@ -53,6 +53,15 @@ # error "__cpp_lib_complex_udls should have the value 201309L in c++20" # endif -#endif // TEST_STD_VER == 20 +#elif TEST_STD_VER > 20 + +# ifndef __cpp_lib_complex_udls +# error "__cpp_lib_complex_udls should be defined in c++2b" +# endif +# if __cpp_lib_complex_udls != 201309L +# error "__cpp_lib_complex_udls should have the value 201309L in c++2b" +# endif + +#endif // TEST_STD_VER > 20 int main(int, char**) { return 0; } Index: libcxx/test/std/language.support/support.limits/support.limits.general/concepts.version.pass.cpp =================================================================== --- libcxx/test/std/language.support/support.limits/support.limits.general/concepts.version.pass.cpp +++ libcxx/test/std/language.support/support.limits/support.limits.general/concepts.version.pass.cpp @@ -53,6 +53,21 @@ # endif # endif -#endif // TEST_STD_VER == 20 +#elif TEST_STD_VER > 20 + +# if !defined(_LIBCPP_VERSION) +# ifndef __cpp_lib_concepts +# error "__cpp_lib_concepts should be defined in c++2b" +# endif +# if __cpp_lib_concepts != 201806L +# error "__cpp_lib_concepts should have the value 201806L in c++2b" +# endif +# else // _LIBCPP_VERSION +# ifdef __cpp_lib_concepts +# error "__cpp_lib_concepts should not be defined because it is unimplemented in libc++!" +# endif +# endif + +#endif // TEST_STD_VER > 20 int main(int, char**) { return 0; } Index: libcxx/test/std/language.support/support.limits/support.limits.general/cstddef.version.pass.cpp =================================================================== --- libcxx/test/std/language.support/support.limits/support.limits.general/cstddef.version.pass.cpp +++ libcxx/test/std/language.support/support.limits/support.limits.general/cstddef.version.pass.cpp @@ -50,6 +50,15 @@ # error "__cpp_lib_byte should have the value 201603L in c++20" # endif -#endif // TEST_STD_VER == 20 +#elif TEST_STD_VER > 20 + +# ifndef __cpp_lib_byte +# error "__cpp_lib_byte should be defined in c++2b" +# endif +# if __cpp_lib_byte != 201603L +# error "__cpp_lib_byte should have the value 201603L in c++2b" +# endif + +#endif // TEST_STD_VER > 20 int main(int, char**) { return 0; } Index: libcxx/test/std/language.support/support.limits/support.limits.general/deque.version.pass.cpp =================================================================== --- libcxx/test/std/language.support/support.limits/support.limits.general/deque.version.pass.cpp +++ libcxx/test/std/language.support/support.limits/support.limits.general/deque.version.pass.cpp @@ -93,6 +93,29 @@ # error "__cpp_lib_nonmember_container_access should have the value 201411L in c++20" # endif -#endif // TEST_STD_VER == 20 +#elif TEST_STD_VER > 20 + +# ifndef __cpp_lib_allocator_traits_is_always_equal +# error "__cpp_lib_allocator_traits_is_always_equal should be defined in c++2b" +# endif +# if __cpp_lib_allocator_traits_is_always_equal != 201411L +# error "__cpp_lib_allocator_traits_is_always_equal should have the value 201411L in c++2b" +# endif + +# ifndef __cpp_lib_erase_if +# error "__cpp_lib_erase_if should be defined in c++2b" +# endif +# if __cpp_lib_erase_if != 202002L +# error "__cpp_lib_erase_if should have the value 202002L in c++2b" +# endif + +# ifndef __cpp_lib_nonmember_container_access +# error "__cpp_lib_nonmember_container_access should be defined in c++2b" +# endif +# if __cpp_lib_nonmember_container_access != 201411L +# error "__cpp_lib_nonmember_container_access should have the value 201411L in c++2b" +# endif + +#endif // TEST_STD_VER > 20 int main(int, char**) { return 0; } Index: libcxx/test/std/language.support/support.limits/support.limits.general/exception.version.pass.cpp =================================================================== --- libcxx/test/std/language.support/support.limits/support.limits.general/exception.version.pass.cpp +++ libcxx/test/std/language.support/support.limits/support.limits.general/exception.version.pass.cpp @@ -50,6 +50,15 @@ # error "__cpp_lib_uncaught_exceptions should have the value 201411L in c++20" # endif -#endif // TEST_STD_VER == 20 +#elif TEST_STD_VER > 20 + +# ifndef __cpp_lib_uncaught_exceptions +# error "__cpp_lib_uncaught_exceptions should be defined in c++2b" +# endif +# if __cpp_lib_uncaught_exceptions != 201411L +# error "__cpp_lib_uncaught_exceptions should have the value 201411L in c++2b" +# endif + +#endif // TEST_STD_VER > 20 int main(int, char**) { return 0; } Index: libcxx/test/std/language.support/support.limits/support.limits.general/execution.version.pass.cpp =================================================================== --- libcxx/test/std/language.support/support.limits/support.limits.general/execution.version.pass.cpp +++ libcxx/test/std/language.support/support.limits/support.limits.general/execution.version.pass.cpp @@ -62,6 +62,21 @@ # endif # endif -#endif // TEST_STD_VER == 20 +#elif TEST_STD_VER > 20 + +# if !defined(_LIBCPP_VERSION) +# ifndef __cpp_lib_execution +# error "__cpp_lib_execution should be defined in c++2b" +# endif +# if __cpp_lib_execution != 201603L +# error "__cpp_lib_execution should have the value 201603L in c++2b" +# endif +# else // _LIBCPP_VERSION +# ifdef __cpp_lib_execution +# error "__cpp_lib_execution should not be defined because it is unimplemented in libc++!" +# endif +# endif + +#endif // TEST_STD_VER > 20 int main(int, char**) { return 0; } Index: libcxx/test/std/language.support/support.limits/support.limits.general/filesystem.version.pass.cpp =================================================================== --- libcxx/test/std/language.support/support.limits/support.limits.general/filesystem.version.pass.cpp +++ libcxx/test/std/language.support/support.limits/support.limits.general/filesystem.version.pass.cpp @@ -76,6 +76,28 @@ # error "__cpp_lib_filesystem should have the value 201703L in c++20" # endif -#endif // TEST_STD_VER == 20 +#elif TEST_STD_VER > 20 + +# if defined(__cpp_char8_t) +# ifndef __cpp_lib_char8_t +# error "__cpp_lib_char8_t should be defined in c++2b" +# endif +# if __cpp_lib_char8_t != 201811L +# error "__cpp_lib_char8_t should have the value 201811L in c++2b" +# endif +# else +# ifdef __cpp_lib_char8_t +# error "__cpp_lib_char8_t should not be defined when defined(__cpp_char8_t) is not defined!" +# endif +# endif + +# ifndef __cpp_lib_filesystem +# error "__cpp_lib_filesystem should be defined in c++2b" +# endif +# if __cpp_lib_filesystem != 201703L +# error "__cpp_lib_filesystem should have the value 201703L in c++2b" +# endif + +#endif // TEST_STD_VER > 20 int main(int, char**) { return 0; } Index: libcxx/test/std/language.support/support.limits/support.limits.general/forward_list.version.pass.cpp =================================================================== --- libcxx/test/std/language.support/support.limits/support.limits.general/forward_list.version.pass.cpp +++ libcxx/test/std/language.support/support.limits/support.limits.general/forward_list.version.pass.cpp @@ -136,6 +136,43 @@ # error "__cpp_lib_nonmember_container_access should have the value 201411L in c++20" # endif -#endif // TEST_STD_VER == 20 +#elif TEST_STD_VER > 20 + +# ifndef __cpp_lib_allocator_traits_is_always_equal +# error "__cpp_lib_allocator_traits_is_always_equal should be defined in c++2b" +# endif +# if __cpp_lib_allocator_traits_is_always_equal != 201411L +# error "__cpp_lib_allocator_traits_is_always_equal should have the value 201411L in c++2b" +# endif + +# ifndef __cpp_lib_erase_if +# error "__cpp_lib_erase_if should be defined in c++2b" +# endif +# if __cpp_lib_erase_if != 202002L +# error "__cpp_lib_erase_if should have the value 202002L in c++2b" +# endif + +# ifndef __cpp_lib_incomplete_container_elements +# error "__cpp_lib_incomplete_container_elements should be defined in c++2b" +# endif +# if __cpp_lib_incomplete_container_elements != 201505L +# error "__cpp_lib_incomplete_container_elements should have the value 201505L in c++2b" +# endif + +# ifndef __cpp_lib_list_remove_return_type +# error "__cpp_lib_list_remove_return_type should be defined in c++2b" +# endif +# if __cpp_lib_list_remove_return_type != 201806L +# error "__cpp_lib_list_remove_return_type should have the value 201806L in c++2b" +# endif + +# ifndef __cpp_lib_nonmember_container_access +# error "__cpp_lib_nonmember_container_access should be defined in c++2b" +# endif +# if __cpp_lib_nonmember_container_access != 201411L +# error "__cpp_lib_nonmember_container_access should have the value 201411L in c++2b" +# endif + +#endif // TEST_STD_VER > 20 int main(int, char**) { return 0; } Index: libcxx/test/std/language.support/support.limits/support.limits.general/functional.version.pass.cpp =================================================================== --- libcxx/test/std/language.support/support.limits/support.limits.general/functional.version.pass.cpp +++ libcxx/test/std/language.support/support.limits/support.limits.general/functional.version.pass.cpp @@ -233,6 +233,82 @@ # error "__cpp_lib_transparent_operators should have the value 201510L in c++20" # endif -#endif // TEST_STD_VER == 20 +#elif TEST_STD_VER > 20 + +# if !defined(_LIBCPP_VERSION) +# ifndef __cpp_lib_bind_front +# error "__cpp_lib_bind_front should be defined in c++2b" +# endif +# if __cpp_lib_bind_front != 201811L +# error "__cpp_lib_bind_front should have the value 201811L in c++2b" +# endif +# else // _LIBCPP_VERSION +# ifdef __cpp_lib_bind_front +# error "__cpp_lib_bind_front should not be defined because it is unimplemented in libc++!" +# endif +# endif + +# if !defined(_LIBCPP_VERSION) +# ifndef __cpp_lib_boyer_moore_searcher +# error "__cpp_lib_boyer_moore_searcher should be defined in c++2b" +# endif +# if __cpp_lib_boyer_moore_searcher != 201603L +# error "__cpp_lib_boyer_moore_searcher should have the value 201603L in c++2b" +# endif +# else // _LIBCPP_VERSION +# ifdef __cpp_lib_boyer_moore_searcher +# error "__cpp_lib_boyer_moore_searcher should not be defined because it is unimplemented in libc++!" +# endif +# endif + +# ifndef __cpp_lib_constexpr_functional +# error "__cpp_lib_constexpr_functional should be defined in c++2b" +# endif +# if __cpp_lib_constexpr_functional != 201907L +# error "__cpp_lib_constexpr_functional should have the value 201907L in c++2b" +# endif + +# ifndef __cpp_lib_invoke +# error "__cpp_lib_invoke should be defined in c++2b" +# endif +# if __cpp_lib_invoke != 201411L +# error "__cpp_lib_invoke should have the value 201411L in c++2b" +# endif + +# ifndef __cpp_lib_not_fn +# error "__cpp_lib_not_fn should be defined in c++2b" +# endif +# if __cpp_lib_not_fn != 201603L +# error "__cpp_lib_not_fn should have the value 201603L in c++2b" +# endif + +# if !defined(_LIBCPP_VERSION) +# ifndef __cpp_lib_ranges +# error "__cpp_lib_ranges should be defined in c++2b" +# endif +# if __cpp_lib_ranges != 201811L +# error "__cpp_lib_ranges should have the value 201811L in c++2b" +# endif +# else // _LIBCPP_VERSION +# ifdef __cpp_lib_ranges +# error "__cpp_lib_ranges should not be defined because it is unimplemented in libc++!" +# endif +# endif + +# ifndef __cpp_lib_result_of_sfinae +# error "__cpp_lib_result_of_sfinae should be defined in c++2b" +# endif +# if __cpp_lib_result_of_sfinae != 201210L +# error "__cpp_lib_result_of_sfinae should have the value 201210L in c++2b" +# endif + +# ifndef __cpp_lib_transparent_operators +# error "__cpp_lib_transparent_operators should be defined in c++2b" +# endif +# if __cpp_lib_transparent_operators != 201510L +# error "__cpp_lib_transparent_operators should have the value 201510L in c++2b" +# endif + +#endif // TEST_STD_VER > 20 int main(int, char**) { return 0; } Index: libcxx/test/std/language.support/support.limits/support.limits.general/iomanip.version.pass.cpp =================================================================== --- libcxx/test/std/language.support/support.limits/support.limits.general/iomanip.version.pass.cpp +++ libcxx/test/std/language.support/support.limits/support.limits.general/iomanip.version.pass.cpp @@ -55,6 +55,15 @@ # error "__cpp_lib_quoted_string_io should have the value 201304L in c++20" # endif -#endif // TEST_STD_VER == 20 +#elif TEST_STD_VER > 20 + +# ifndef __cpp_lib_quoted_string_io +# error "__cpp_lib_quoted_string_io should be defined in c++2b" +# endif +# if __cpp_lib_quoted_string_io != 201304L +# error "__cpp_lib_quoted_string_io should have the value 201304L in c++2b" +# endif + +#endif // TEST_STD_VER > 20 int main(int, char**) { return 0; } Index: libcxx/test/std/language.support/support.limits/support.limits.general/istream.version.pass.cpp =================================================================== --- libcxx/test/std/language.support/support.limits/support.limits.general/istream.version.pass.cpp +++ libcxx/test/std/language.support/support.limits/support.limits.general/istream.version.pass.cpp @@ -55,6 +55,21 @@ # endif # endif -#endif // TEST_STD_VER == 20 +#elif TEST_STD_VER > 20 + +# if defined(__cpp_char8_t) +# ifndef __cpp_lib_char8_t +# error "__cpp_lib_char8_t should be defined in c++2b" +# endif +# if __cpp_lib_char8_t != 201811L +# error "__cpp_lib_char8_t should have the value 201811L in c++2b" +# endif +# else +# ifdef __cpp_lib_char8_t +# error "__cpp_lib_char8_t should not be defined when defined(__cpp_char8_t) is not defined!" +# endif +# endif + +#endif // TEST_STD_VER > 20 int main(int, char**) { return 0; } Index: libcxx/test/std/language.support/support.limits/support.limits.general/iterator.version.pass.cpp =================================================================== --- libcxx/test/std/language.support/support.limits/support.limits.general/iterator.version.pass.cpp +++ libcxx/test/std/language.support/support.limits/support.limits.general/iterator.version.pass.cpp @@ -152,6 +152,49 @@ # endif # endif -#endif // TEST_STD_VER == 20 +#elif TEST_STD_VER > 20 + +# ifndef __cpp_lib_array_constexpr +# error "__cpp_lib_array_constexpr should be defined in c++2b" +# endif +# if __cpp_lib_array_constexpr != 201811L +# error "__cpp_lib_array_constexpr should have the value 201811L in c++2b" +# endif + +# ifndef __cpp_lib_make_reverse_iterator +# error "__cpp_lib_make_reverse_iterator should be defined in c++2b" +# endif +# if __cpp_lib_make_reverse_iterator != 201402L +# error "__cpp_lib_make_reverse_iterator should have the value 201402L in c++2b" +# endif + +# ifndef __cpp_lib_nonmember_container_access +# error "__cpp_lib_nonmember_container_access should be defined in c++2b" +# endif +# if __cpp_lib_nonmember_container_access != 201411L +# error "__cpp_lib_nonmember_container_access should have the value 201411L in c++2b" +# endif + +# ifndef __cpp_lib_null_iterators +# error "__cpp_lib_null_iterators should be defined in c++2b" +# endif +# if __cpp_lib_null_iterators != 201304L +# error "__cpp_lib_null_iterators should have the value 201304L in c++2b" +# endif + +# if !defined(_LIBCPP_VERSION) +# ifndef __cpp_lib_ranges +# error "__cpp_lib_ranges should be defined in c++2b" +# endif +# if __cpp_lib_ranges != 201811L +# error "__cpp_lib_ranges should have the value 201811L in c++2b" +# endif +# else // _LIBCPP_VERSION +# ifdef __cpp_lib_ranges +# error "__cpp_lib_ranges should not be defined because it is unimplemented in libc++!" +# endif +# endif + +#endif // TEST_STD_VER > 20 int main(int, char**) { return 0; } Index: libcxx/test/std/language.support/support.limits/support.limits.general/limits.version.pass.cpp =================================================================== --- libcxx/test/std/language.support/support.limits/support.limits.general/limits.version.pass.cpp +++ libcxx/test/std/language.support/support.limits/support.limits.general/limits.version.pass.cpp @@ -53,6 +53,21 @@ # endif # endif -#endif // TEST_STD_VER == 20 +#elif TEST_STD_VER > 20 + +# if defined(__cpp_char8_t) +# ifndef __cpp_lib_char8_t +# error "__cpp_lib_char8_t should be defined in c++2b" +# endif +# if __cpp_lib_char8_t != 201811L +# error "__cpp_lib_char8_t should have the value 201811L in c++2b" +# endif +# else +# ifdef __cpp_lib_char8_t +# error "__cpp_lib_char8_t should not be defined when defined(__cpp_char8_t) is not defined!" +# endif +# endif + +#endif // TEST_STD_VER > 20 int main(int, char**) { return 0; } Index: libcxx/test/std/language.support/support.limits/support.limits.general/list.version.pass.cpp =================================================================== --- libcxx/test/std/language.support/support.limits/support.limits.general/list.version.pass.cpp +++ libcxx/test/std/language.support/support.limits/support.limits.general/list.version.pass.cpp @@ -136,6 +136,43 @@ # error "__cpp_lib_nonmember_container_access should have the value 201411L in c++20" # endif -#endif // TEST_STD_VER == 20 +#elif TEST_STD_VER > 20 + +# ifndef __cpp_lib_allocator_traits_is_always_equal +# error "__cpp_lib_allocator_traits_is_always_equal should be defined in c++2b" +# endif +# if __cpp_lib_allocator_traits_is_always_equal != 201411L +# error "__cpp_lib_allocator_traits_is_always_equal should have the value 201411L in c++2b" +# endif + +# ifndef __cpp_lib_erase_if +# error "__cpp_lib_erase_if should be defined in c++2b" +# endif +# if __cpp_lib_erase_if != 202002L +# error "__cpp_lib_erase_if should have the value 202002L in c++2b" +# endif + +# ifndef __cpp_lib_incomplete_container_elements +# error "__cpp_lib_incomplete_container_elements should be defined in c++2b" +# endif +# if __cpp_lib_incomplete_container_elements != 201505L +# error "__cpp_lib_incomplete_container_elements should have the value 201505L in c++2b" +# endif + +# ifndef __cpp_lib_list_remove_return_type +# error "__cpp_lib_list_remove_return_type should be defined in c++2b" +# endif +# if __cpp_lib_list_remove_return_type != 201806L +# error "__cpp_lib_list_remove_return_type should have the value 201806L in c++2b" +# endif + +# ifndef __cpp_lib_nonmember_container_access +# error "__cpp_lib_nonmember_container_access should be defined in c++2b" +# endif +# if __cpp_lib_nonmember_container_access != 201411L +# error "__cpp_lib_nonmember_container_access should have the value 201411L in c++2b" +# endif + +#endif // TEST_STD_VER > 20 int main(int, char**) { return 0; } Index: libcxx/test/std/language.support/support.limits/support.limits.general/locale.version.pass.cpp =================================================================== --- libcxx/test/std/language.support/support.limits/support.limits.general/locale.version.pass.cpp +++ libcxx/test/std/language.support/support.limits/support.limits.general/locale.version.pass.cpp @@ -55,6 +55,21 @@ # endif # endif -#endif // TEST_STD_VER == 20 +#elif TEST_STD_VER > 20 + +# if defined(__cpp_char8_t) +# ifndef __cpp_lib_char8_t +# error "__cpp_lib_char8_t should be defined in c++2b" +# endif +# if __cpp_lib_char8_t != 201811L +# error "__cpp_lib_char8_t should have the value 201811L in c++2b" +# endif +# else +# ifdef __cpp_lib_char8_t +# error "__cpp_lib_char8_t should not be defined when defined(__cpp_char8_t) is not defined!" +# endif +# endif + +#endif // TEST_STD_VER > 20 int main(int, char**) { return 0; } Index: libcxx/test/std/language.support/support.limits/support.limits.general/map.version.pass.cpp =================================================================== --- libcxx/test/std/language.support/support.limits/support.limits.general/map.version.pass.cpp +++ libcxx/test/std/language.support/support.limits/support.limits.general/map.version.pass.cpp @@ -165,6 +165,50 @@ # error "__cpp_lib_nonmember_container_access should have the value 201411L in c++20" # endif -#endif // TEST_STD_VER == 20 +#elif TEST_STD_VER > 20 + +# ifndef __cpp_lib_allocator_traits_is_always_equal +# error "__cpp_lib_allocator_traits_is_always_equal should be defined in c++2b" +# endif +# if __cpp_lib_allocator_traits_is_always_equal != 201411L +# error "__cpp_lib_allocator_traits_is_always_equal should have the value 201411L in c++2b" +# endif + +# ifndef __cpp_lib_erase_if +# error "__cpp_lib_erase_if should be defined in c++2b" +# endif +# if __cpp_lib_erase_if != 202002L +# error "__cpp_lib_erase_if should have the value 202002L in c++2b" +# endif + +# ifndef __cpp_lib_generic_associative_lookup +# error "__cpp_lib_generic_associative_lookup should be defined in c++2b" +# endif +# if __cpp_lib_generic_associative_lookup != 201304L +# error "__cpp_lib_generic_associative_lookup should have the value 201304L in c++2b" +# endif + +# ifndef __cpp_lib_map_try_emplace +# error "__cpp_lib_map_try_emplace should be defined in c++2b" +# endif +# if __cpp_lib_map_try_emplace != 201411L +# error "__cpp_lib_map_try_emplace should have the value 201411L in c++2b" +# endif + +# ifndef __cpp_lib_node_extract +# error "__cpp_lib_node_extract should be defined in c++2b" +# endif +# if __cpp_lib_node_extract != 201606L +# error "__cpp_lib_node_extract should have the value 201606L in c++2b" +# endif + +# ifndef __cpp_lib_nonmember_container_access +# error "__cpp_lib_nonmember_container_access should be defined in c++2b" +# endif +# if __cpp_lib_nonmember_container_access != 201411L +# error "__cpp_lib_nonmember_container_access should have the value 201411L in c++2b" +# endif + +#endif // TEST_STD_VER > 20 int main(int, char**) { return 0; } Index: libcxx/test/std/language.support/support.limits/support.limits.general/memory.version.pass.cpp =================================================================== --- libcxx/test/std/language.support/support.limits/support.limits.general/memory.version.pass.cpp +++ libcxx/test/std/language.support/support.limits/support.limits.general/memory.version.pass.cpp @@ -275,6 +275,96 @@ # error "__cpp_lib_shared_ptr_weak_type should have the value 201606L in c++20" # endif -#endif // TEST_STD_VER == 20 +#elif TEST_STD_VER > 20 + +# if TEST_HAS_BUILTIN(__builtin_addressof) || TEST_GCC_VER >= 700 +# ifndef __cpp_lib_addressof_constexpr +# error "__cpp_lib_addressof_constexpr should be defined in c++2b" +# endif +# if __cpp_lib_addressof_constexpr != 201603L +# error "__cpp_lib_addressof_constexpr should have the value 201603L in c++2b" +# endif +# else +# ifdef __cpp_lib_addressof_constexpr +# error "__cpp_lib_addressof_constexpr should not be defined when TEST_HAS_BUILTIN(__builtin_addressof) || TEST_GCC_VER >= 700 is not defined!" +# endif +# endif + +# ifndef __cpp_lib_allocator_traits_is_always_equal +# error "__cpp_lib_allocator_traits_is_always_equal should be defined in c++2b" +# endif +# if __cpp_lib_allocator_traits_is_always_equal != 201411L +# error "__cpp_lib_allocator_traits_is_always_equal should have the value 201411L in c++2b" +# endif + +# if !defined(_LIBCPP_VERSION) +# ifndef __cpp_lib_atomic_value_initialization +# error "__cpp_lib_atomic_value_initialization should be defined in c++2b" +# endif +# if __cpp_lib_atomic_value_initialization != 201911L +# error "__cpp_lib_atomic_value_initialization should have the value 201911L in c++2b" +# endif +# else // _LIBCPP_VERSION +# ifdef __cpp_lib_atomic_value_initialization +# error "__cpp_lib_atomic_value_initialization should not be defined because it is unimplemented in libc++!" +# endif +# endif + +# ifndef __cpp_lib_constexpr_dynamic_alloc +# error "__cpp_lib_constexpr_dynamic_alloc should be defined in c++2b" +# endif +# if __cpp_lib_constexpr_dynamic_alloc != 201907L +# error "__cpp_lib_constexpr_dynamic_alloc should have the value 201907L in c++2b" +# endif + +# ifndef __cpp_lib_enable_shared_from_this +# error "__cpp_lib_enable_shared_from_this should be defined in c++2b" +# endif +# if __cpp_lib_enable_shared_from_this != 201603L +# error "__cpp_lib_enable_shared_from_this should have the value 201603L in c++2b" +# endif + +# ifndef __cpp_lib_make_unique +# error "__cpp_lib_make_unique should be defined in c++2b" +# endif +# if __cpp_lib_make_unique != 201304L +# error "__cpp_lib_make_unique should have the value 201304L in c++2b" +# endif + +# if !defined(_LIBCPP_VERSION) +# ifndef __cpp_lib_ranges +# error "__cpp_lib_ranges should be defined in c++2b" +# endif +# if __cpp_lib_ranges != 201811L +# error "__cpp_lib_ranges should have the value 201811L in c++2b" +# endif +# else // _LIBCPP_VERSION +# ifdef __cpp_lib_ranges +# error "__cpp_lib_ranges should not be defined because it is unimplemented in libc++!" +# endif +# endif + +# ifndef __cpp_lib_raw_memory_algorithms +# error "__cpp_lib_raw_memory_algorithms should be defined in c++2b" +# endif +# if __cpp_lib_raw_memory_algorithms != 201606L +# error "__cpp_lib_raw_memory_algorithms should have the value 201606L in c++2b" +# endif + +# ifndef __cpp_lib_shared_ptr_arrays +# error "__cpp_lib_shared_ptr_arrays should be defined in c++2b" +# endif +# if __cpp_lib_shared_ptr_arrays != 201611L +# error "__cpp_lib_shared_ptr_arrays should have the value 201611L in c++2b" +# endif + +# ifndef __cpp_lib_shared_ptr_weak_type +# error "__cpp_lib_shared_ptr_weak_type should be defined in c++2b" +# endif +# if __cpp_lib_shared_ptr_weak_type != 201606L +# error "__cpp_lib_shared_ptr_weak_type should have the value 201606L in c++2b" +# endif + +#endif // TEST_STD_VER > 20 int main(int, char**) { return 0; } Index: libcxx/test/std/language.support/support.limits/support.limits.general/mutex.version.pass.cpp =================================================================== --- libcxx/test/std/language.support/support.limits/support.limits.general/mutex.version.pass.cpp +++ libcxx/test/std/language.support/support.limits/support.limits.general/mutex.version.pass.cpp @@ -50,6 +50,15 @@ # error "__cpp_lib_scoped_lock should have the value 201703L in c++20" # endif -#endif // TEST_STD_VER == 20 +#elif TEST_STD_VER > 20 + +# ifndef __cpp_lib_scoped_lock +# error "__cpp_lib_scoped_lock should be defined in c++2b" +# endif +# if __cpp_lib_scoped_lock != 201703L +# error "__cpp_lib_scoped_lock should have the value 201703L in c++2b" +# endif + +#endif // TEST_STD_VER > 20 int main(int, char**) { return 0; } Index: libcxx/test/std/language.support/support.limits/support.limits.general/new.version.pass.cpp =================================================================== --- libcxx/test/std/language.support/support.limits/support.limits.general/new.version.pass.cpp +++ libcxx/test/std/language.support/support.limits/support.limits.general/new.version.pass.cpp @@ -111,6 +111,41 @@ # error "__cpp_lib_launder should have the value 201606L in c++20" # endif -#endif // TEST_STD_VER == 20 +#elif TEST_STD_VER > 20 + +# if TEST_STD_VER > 17 && defined(__cpp_impl_destroying_delete) && __cpp_impl_destroying_delete >= 201806L +# ifndef __cpp_lib_destroying_delete +# error "__cpp_lib_destroying_delete should be defined in c++2b" +# endif +# if __cpp_lib_destroying_delete != 201806L +# error "__cpp_lib_destroying_delete should have the value 201806L in c++2b" +# endif +# else +# ifdef __cpp_lib_destroying_delete +# error "__cpp_lib_destroying_delete should not be defined when TEST_STD_VER > 17 && defined(__cpp_impl_destroying_delete) && __cpp_impl_destroying_delete >= 201806L is not defined!" +# endif +# endif + +# if !defined(_LIBCPP_VERSION) +# ifndef __cpp_lib_hardware_interference_size +# error "__cpp_lib_hardware_interference_size should be defined in c++2b" +# endif +# if __cpp_lib_hardware_interference_size != 201703L +# error "__cpp_lib_hardware_interference_size should have the value 201703L in c++2b" +# endif +# else // _LIBCPP_VERSION +# ifdef __cpp_lib_hardware_interference_size +# error "__cpp_lib_hardware_interference_size should not be defined because it is unimplemented in libc++!" +# endif +# endif + +# ifndef __cpp_lib_launder +# error "__cpp_lib_launder should be defined in c++2b" +# endif +# if __cpp_lib_launder != 201606L +# error "__cpp_lib_launder should have the value 201606L in c++2b" +# endif + +#endif // TEST_STD_VER > 20 int main(int, char**) { return 0; } Index: libcxx/test/std/language.support/support.limits/support.limits.general/numbers.version.pass.cpp =================================================================== --- libcxx/test/std/language.support/support.limits/support.limits.general/numbers.version.pass.cpp +++ libcxx/test/std/language.support/support.limits/support.limits.general/numbers.version.pass.cpp @@ -53,6 +53,21 @@ # endif # endif -#endif // TEST_STD_VER == 20 +#elif TEST_STD_VER > 20 + +# if defined(__cpp_concepts) && __cpp_concepts >= 201811L +# ifndef __cpp_lib_math_constants +# error "__cpp_lib_math_constants should be defined in c++2b" +# endif +# if __cpp_lib_math_constants != 201907L +# error "__cpp_lib_math_constants should have the value 201907L in c++2b" +# endif +# else +# ifdef __cpp_lib_math_constants +# error "__cpp_lib_math_constants should not be defined when defined(__cpp_concepts) && __cpp_concepts >= 201811L is not defined!" +# endif +# endif + +#endif // TEST_STD_VER > 20 int main(int, char**) { return 0; } Index: libcxx/test/std/language.support/support.limits/support.limits.general/numeric.version.pass.cpp =================================================================== --- libcxx/test/std/language.support/support.limits/support.limits.general/numeric.version.pass.cpp +++ libcxx/test/std/language.support/support.limits/support.limits.general/numeric.version.pass.cpp @@ -125,6 +125,42 @@ # endif # endif -#endif // TEST_STD_VER == 20 +#elif TEST_STD_VER > 20 + +# ifndef __cpp_lib_constexpr_numeric +# error "__cpp_lib_constexpr_numeric should be defined in c++2b" +# endif +# if __cpp_lib_constexpr_numeric != 201911L +# error "__cpp_lib_constexpr_numeric should have the value 201911L in c++2b" +# endif + +# ifndef __cpp_lib_gcd_lcm +# error "__cpp_lib_gcd_lcm should be defined in c++2b" +# endif +# if __cpp_lib_gcd_lcm != 201606L +# error "__cpp_lib_gcd_lcm should have the value 201606L in c++2b" +# endif + +# ifndef __cpp_lib_interpolate +# error "__cpp_lib_interpolate should be defined in c++2b" +# endif +# if __cpp_lib_interpolate != 201902L +# error "__cpp_lib_interpolate should have the value 201902L in c++2b" +# endif + +# if !defined(_LIBCPP_VERSION) +# ifndef __cpp_lib_parallel_algorithm +# error "__cpp_lib_parallel_algorithm should be defined in c++2b" +# endif +# if __cpp_lib_parallel_algorithm != 201603L +# error "__cpp_lib_parallel_algorithm should have the value 201603L in c++2b" +# endif +# else // _LIBCPP_VERSION +# ifdef __cpp_lib_parallel_algorithm +# error "__cpp_lib_parallel_algorithm should not be defined because it is unimplemented in libc++!" +# endif +# endif + +#endif // TEST_STD_VER > 20 int main(int, char**) { return 0; } Index: libcxx/test/std/language.support/support.limits/support.limits.general/optional.version.pass.cpp =================================================================== --- libcxx/test/std/language.support/support.limits/support.limits.general/optional.version.pass.cpp +++ libcxx/test/std/language.support/support.limits/support.limits.general/optional.version.pass.cpp @@ -50,6 +50,15 @@ # error "__cpp_lib_optional should have the value 201606L in c++20" # endif -#endif // TEST_STD_VER == 20 +#elif TEST_STD_VER > 20 + +# ifndef __cpp_lib_optional +# error "__cpp_lib_optional should be defined in c++2b" +# endif +# if __cpp_lib_optional != 201606L +# error "__cpp_lib_optional should have the value 201606L in c++2b" +# endif + +#endif // TEST_STD_VER > 20 int main(int, char**) { return 0; } Index: libcxx/test/std/language.support/support.limits/support.limits.general/ostream.version.pass.cpp =================================================================== --- libcxx/test/std/language.support/support.limits/support.limits.general/ostream.version.pass.cpp +++ libcxx/test/std/language.support/support.limits/support.limits.general/ostream.version.pass.cpp @@ -55,6 +55,21 @@ # endif # endif -#endif // TEST_STD_VER == 20 +#elif TEST_STD_VER > 20 + +# if defined(__cpp_char8_t) +# ifndef __cpp_lib_char8_t +# error "__cpp_lib_char8_t should be defined in c++2b" +# endif +# if __cpp_lib_char8_t != 201811L +# error "__cpp_lib_char8_t should have the value 201811L in c++2b" +# endif +# else +# ifdef __cpp_lib_char8_t +# error "__cpp_lib_char8_t should not be defined when defined(__cpp_char8_t) is not defined!" +# endif +# endif + +#endif // TEST_STD_VER > 20 int main(int, char**) { return 0; } Index: libcxx/test/std/language.support/support.limits/support.limits.general/regex.version.pass.cpp =================================================================== --- libcxx/test/std/language.support/support.limits/support.limits.general/regex.version.pass.cpp +++ libcxx/test/std/language.support/support.limits/support.limits.general/regex.version.pass.cpp @@ -52,6 +52,15 @@ # error "__cpp_lib_nonmember_container_access should have the value 201411L in c++20" # endif -#endif // TEST_STD_VER == 20 +#elif TEST_STD_VER > 20 + +# ifndef __cpp_lib_nonmember_container_access +# error "__cpp_lib_nonmember_container_access should be defined in c++2b" +# endif +# if __cpp_lib_nonmember_container_access != 201411L +# error "__cpp_lib_nonmember_container_access should have the value 201411L in c++2b" +# endif + +#endif // TEST_STD_VER > 20 int main(int, char**) { return 0; } Index: libcxx/test/std/language.support/support.limits/support.limits.general/scoped_allocator.version.pass.cpp =================================================================== --- libcxx/test/std/language.support/support.limits/support.limits.general/scoped_allocator.version.pass.cpp +++ libcxx/test/std/language.support/support.limits/support.limits.general/scoped_allocator.version.pass.cpp @@ -50,6 +50,15 @@ # error "__cpp_lib_allocator_traits_is_always_equal should have the value 201411L in c++20" # endif -#endif // TEST_STD_VER == 20 +#elif TEST_STD_VER > 20 + +# ifndef __cpp_lib_allocator_traits_is_always_equal +# error "__cpp_lib_allocator_traits_is_always_equal should be defined in c++2b" +# endif +# if __cpp_lib_allocator_traits_is_always_equal != 201411L +# error "__cpp_lib_allocator_traits_is_always_equal should have the value 201411L in c++2b" +# endif + +#endif // TEST_STD_VER > 20 int main(int, char**) { return 0; } Index: libcxx/test/std/language.support/support.limits/support.limits.general/set.version.pass.cpp =================================================================== --- libcxx/test/std/language.support/support.limits/support.limits.general/set.version.pass.cpp +++ libcxx/test/std/language.support/support.limits/support.limits.general/set.version.pass.cpp @@ -142,6 +142,43 @@ # error "__cpp_lib_nonmember_container_access should have the value 201411L in c++20" # endif -#endif // TEST_STD_VER == 20 +#elif TEST_STD_VER > 20 + +# ifndef __cpp_lib_allocator_traits_is_always_equal +# error "__cpp_lib_allocator_traits_is_always_equal should be defined in c++2b" +# endif +# if __cpp_lib_allocator_traits_is_always_equal != 201411L +# error "__cpp_lib_allocator_traits_is_always_equal should have the value 201411L in c++2b" +# endif + +# ifndef __cpp_lib_erase_if +# error "__cpp_lib_erase_if should be defined in c++2b" +# endif +# if __cpp_lib_erase_if != 202002L +# error "__cpp_lib_erase_if should have the value 202002L in c++2b" +# endif + +# ifndef __cpp_lib_generic_associative_lookup +# error "__cpp_lib_generic_associative_lookup should be defined in c++2b" +# endif +# if __cpp_lib_generic_associative_lookup != 201304L +# error "__cpp_lib_generic_associative_lookup should have the value 201304L in c++2b" +# endif + +# ifndef __cpp_lib_node_extract +# error "__cpp_lib_node_extract should be defined in c++2b" +# endif +# if __cpp_lib_node_extract != 201606L +# error "__cpp_lib_node_extract should have the value 201606L in c++2b" +# endif + +# ifndef __cpp_lib_nonmember_container_access +# error "__cpp_lib_nonmember_container_access should be defined in c++2b" +# endif +# if __cpp_lib_nonmember_container_access != 201411L +# error "__cpp_lib_nonmember_container_access should have the value 201411L in c++2b" +# endif + +#endif // TEST_STD_VER > 20 int main(int, char**) { return 0; } Index: libcxx/test/std/language.support/support.limits/support.limits.general/shared_mutex.version.pass.cpp =================================================================== --- libcxx/test/std/language.support/support.limits/support.limits.general/shared_mutex.version.pass.cpp +++ libcxx/test/std/language.support/support.limits/support.limits.general/shared_mutex.version.pass.cpp @@ -108,6 +108,34 @@ # endif # endif -#endif // TEST_STD_VER == 20 +#elif TEST_STD_VER > 20 + +# if !defined(_LIBCPP_HAS_NO_THREADS) +# ifndef __cpp_lib_shared_mutex +# error "__cpp_lib_shared_mutex should be defined in c++2b" +# endif +# if __cpp_lib_shared_mutex != 201505L +# error "__cpp_lib_shared_mutex should have the value 201505L in c++2b" +# endif +# else +# ifdef __cpp_lib_shared_mutex +# error "__cpp_lib_shared_mutex should not be defined when !defined(_LIBCPP_HAS_NO_THREADS) is not defined!" +# endif +# endif + +# if !defined(_LIBCPP_HAS_NO_THREADS) +# ifndef __cpp_lib_shared_timed_mutex +# error "__cpp_lib_shared_timed_mutex should be defined in c++2b" +# endif +# if __cpp_lib_shared_timed_mutex != 201402L +# error "__cpp_lib_shared_timed_mutex should have the value 201402L in c++2b" +# endif +# else +# ifdef __cpp_lib_shared_timed_mutex +# error "__cpp_lib_shared_timed_mutex should not be defined when !defined(_LIBCPP_HAS_NO_THREADS) is not defined!" +# endif +# endif + +#endif // TEST_STD_VER > 20 int main(int, char**) { return 0; } Index: libcxx/test/std/language.support/support.limits/support.limits.general/span.version.pass.cpp =================================================================== --- libcxx/test/std/language.support/support.limits/support.limits.general/span.version.pass.cpp +++ libcxx/test/std/language.support/support.limits/support.limits.general/span.version.pass.cpp @@ -47,6 +47,15 @@ # error "__cpp_lib_span should have the value 202002L in c++20" # endif -#endif // TEST_STD_VER == 20 +#elif TEST_STD_VER > 20 + +# ifndef __cpp_lib_span +# error "__cpp_lib_span should be defined in c++2b" +# endif +# if __cpp_lib_span != 202002L +# error "__cpp_lib_span should have the value 202002L in c++2b" +# endif + +#endif // TEST_STD_VER > 20 int main(int, char**) { return 0; } Index: libcxx/test/std/language.support/support.limits/support.limits.general/string.version.pass.cpp =================================================================== --- libcxx/test/std/language.support/support.limits/support.limits.general/string.version.pass.cpp +++ libcxx/test/std/language.support/support.limits/support.limits.general/string.version.pass.cpp @@ -18,6 +18,7 @@ __cpp_lib_char8_t 201811L [C++20] __cpp_lib_erase_if 202002L [C++20] __cpp_lib_nonmember_container_access 201411L [C++17] + __cpp_lib_string_contains 202011L [C++2b] __cpp_lib_string_udls 201304L [C++14] __cpp_lib_string_view 201606L [C++17] */ @@ -43,6 +44,10 @@ # error "__cpp_lib_nonmember_container_access should not be defined before c++17" # endif +# ifdef __cpp_lib_string_contains +# error "__cpp_lib_string_contains should not be defined before c++2b" +# endif + # ifdef __cpp_lib_string_udls # error "__cpp_lib_string_udls should not be defined before c++14" # endif @@ -69,6 +74,10 @@ # error "__cpp_lib_nonmember_container_access should not be defined before c++17" # endif +# ifdef __cpp_lib_string_contains +# error "__cpp_lib_string_contains should not be defined before c++2b" +# endif + # ifndef __cpp_lib_string_udls # error "__cpp_lib_string_udls should be defined in c++14" # endif @@ -104,6 +113,10 @@ # error "__cpp_lib_nonmember_container_access should have the value 201411L in c++17" # endif +# ifdef __cpp_lib_string_contains +# error "__cpp_lib_string_contains should not be defined before c++2b" +# endif + # ifndef __cpp_lib_string_udls # error "__cpp_lib_string_udls should be defined in c++17" # endif @@ -154,6 +167,10 @@ # error "__cpp_lib_nonmember_container_access should have the value 201411L in c++20" # endif +# ifdef __cpp_lib_string_contains +# error "__cpp_lib_string_contains should not be defined before c++2b" +# endif + # ifndef __cpp_lib_string_udls # error "__cpp_lib_string_udls should be defined in c++20" # endif @@ -168,6 +185,63 @@ # error "__cpp_lib_string_view should have the value 201606L in c++20" # endif -#endif // TEST_STD_VER == 20 +#elif TEST_STD_VER > 20 + +# ifndef __cpp_lib_allocator_traits_is_always_equal +# error "__cpp_lib_allocator_traits_is_always_equal should be defined in c++2b" +# endif +# if __cpp_lib_allocator_traits_is_always_equal != 201411L +# error "__cpp_lib_allocator_traits_is_always_equal should have the value 201411L in c++2b" +# endif + +# if defined(__cpp_char8_t) +# ifndef __cpp_lib_char8_t +# error "__cpp_lib_char8_t should be defined in c++2b" +# endif +# if __cpp_lib_char8_t != 201811L +# error "__cpp_lib_char8_t should have the value 201811L in c++2b" +# endif +# else +# ifdef __cpp_lib_char8_t +# error "__cpp_lib_char8_t should not be defined when defined(__cpp_char8_t) is not defined!" +# endif +# endif + +# ifndef __cpp_lib_erase_if +# error "__cpp_lib_erase_if should be defined in c++2b" +# endif +# if __cpp_lib_erase_if != 202002L +# error "__cpp_lib_erase_if should have the value 202002L in c++2b" +# endif + +# ifndef __cpp_lib_nonmember_container_access +# error "__cpp_lib_nonmember_container_access should be defined in c++2b" +# endif +# if __cpp_lib_nonmember_container_access != 201411L +# error "__cpp_lib_nonmember_container_access should have the value 201411L in c++2b" +# endif + +# ifndef __cpp_lib_string_contains +# error "__cpp_lib_string_contains should be defined in c++2b" +# endif +# if __cpp_lib_string_contains != 202011L +# error "__cpp_lib_string_contains should have the value 202011L in c++2b" +# endif + +# ifndef __cpp_lib_string_udls +# error "__cpp_lib_string_udls should be defined in c++2b" +# endif +# if __cpp_lib_string_udls != 201304L +# error "__cpp_lib_string_udls should have the value 201304L in c++2b" +# endif + +# ifndef __cpp_lib_string_view +# error "__cpp_lib_string_view should be defined in c++2b" +# endif +# if __cpp_lib_string_view != 201606L +# error "__cpp_lib_string_view should have the value 201606L in c++2b" +# endif + +#endif // TEST_STD_VER > 20 int main(int, char**) { return 0; } Index: libcxx/test/std/language.support/support.limits/support.limits.general/string_view.version.pass.cpp =================================================================== --- libcxx/test/std/language.support/support.limits/support.limits.general/string_view.version.pass.cpp +++ libcxx/test/std/language.support/support.limits/support.limits.general/string_view.version.pass.cpp @@ -13,9 +13,10 @@ // Test the feature test macros defined by -/* Constant Value - __cpp_lib_char8_t 201811L [C++20] - __cpp_lib_string_view 201606L [C++17] +/* Constant Value + __cpp_lib_char8_t 201811L [C++20] + __cpp_lib_string_contains 202011L [C++2b] + __cpp_lib_string_view 201606L [C++17] */ #include @@ -27,6 +28,10 @@ # error "__cpp_lib_char8_t should not be defined before c++20" # endif +# ifdef __cpp_lib_string_contains +# error "__cpp_lib_string_contains should not be defined before c++2b" +# endif + # ifdef __cpp_lib_string_view # error "__cpp_lib_string_view should not be defined before c++17" # endif @@ -37,6 +42,10 @@ # error "__cpp_lib_char8_t should not be defined before c++20" # endif +# ifdef __cpp_lib_string_contains +# error "__cpp_lib_string_contains should not be defined before c++2b" +# endif + # ifdef __cpp_lib_string_view # error "__cpp_lib_string_view should not be defined before c++17" # endif @@ -47,6 +56,10 @@ # error "__cpp_lib_char8_t should not be defined before c++20" # endif +# ifdef __cpp_lib_string_contains +# error "__cpp_lib_string_contains should not be defined before c++2b" +# endif + # ifndef __cpp_lib_string_view # error "__cpp_lib_string_view should be defined in c++17" # endif @@ -69,6 +82,10 @@ # endif # endif +# ifdef __cpp_lib_string_contains +# error "__cpp_lib_string_contains should not be defined before c++2b" +# endif + # ifndef __cpp_lib_string_view # error "__cpp_lib_string_view should be defined in c++20" # endif @@ -76,6 +93,35 @@ # error "__cpp_lib_string_view should have the value 201606L in c++20" # endif -#endif // TEST_STD_VER == 20 +#elif TEST_STD_VER > 20 + +# if defined(__cpp_char8_t) +# ifndef __cpp_lib_char8_t +# error "__cpp_lib_char8_t should be defined in c++2b" +# endif +# if __cpp_lib_char8_t != 201811L +# error "__cpp_lib_char8_t should have the value 201811L in c++2b" +# endif +# else +# ifdef __cpp_lib_char8_t +# error "__cpp_lib_char8_t should not be defined when defined(__cpp_char8_t) is not defined!" +# endif +# endif + +# ifndef __cpp_lib_string_contains +# error "__cpp_lib_string_contains should be defined in c++2b" +# endif +# if __cpp_lib_string_contains != 202011L +# error "__cpp_lib_string_contains should have the value 202011L in c++2b" +# endif + +# ifndef __cpp_lib_string_view +# error "__cpp_lib_string_view should be defined in c++2b" +# endif +# if __cpp_lib_string_view != 201606L +# error "__cpp_lib_string_view should have the value 201606L in c++2b" +# endif + +#endif // TEST_STD_VER > 20 int main(int, char**) { return 0; } Index: libcxx/test/std/language.support/support.limits/support.limits.general/tuple.version.pass.cpp =================================================================== --- libcxx/test/std/language.support/support.limits/support.limits.general/tuple.version.pass.cpp +++ libcxx/test/std/language.support/support.limits/support.limits.general/tuple.version.pass.cpp @@ -125,6 +125,36 @@ # error "__cpp_lib_tuples_by_type should have the value 201304L in c++20" # endif -#endif // TEST_STD_VER == 20 +#elif TEST_STD_VER > 20 + +# ifndef __cpp_lib_apply +# error "__cpp_lib_apply should be defined in c++2b" +# endif +# if __cpp_lib_apply != 201603L +# error "__cpp_lib_apply should have the value 201603L in c++2b" +# endif + +# ifndef __cpp_lib_make_from_tuple +# error "__cpp_lib_make_from_tuple should be defined in c++2b" +# endif +# if __cpp_lib_make_from_tuple != 201606L +# error "__cpp_lib_make_from_tuple should have the value 201606L in c++2b" +# endif + +# ifndef __cpp_lib_tuple_element_t +# error "__cpp_lib_tuple_element_t should be defined in c++2b" +# endif +# if __cpp_lib_tuple_element_t != 201402L +# error "__cpp_lib_tuple_element_t should have the value 201402L in c++2b" +# endif + +# ifndef __cpp_lib_tuples_by_type +# error "__cpp_lib_tuples_by_type should be defined in c++2b" +# endif +# if __cpp_lib_tuples_by_type != 201304L +# error "__cpp_lib_tuples_by_type should have the value 201304L in c++2b" +# endif + +#endif // TEST_STD_VER > 20 int main(int, char**) { return 0; } Index: libcxx/test/std/language.support/support.limits/support.limits.general/type_traits.version.pass.cpp =================================================================== --- libcxx/test/std/language.support/support.limits/support.limits.general/type_traits.version.pass.cpp +++ libcxx/test/std/language.support/support.limits/support.limits.general/type_traits.version.pass.cpp @@ -391,6 +391,124 @@ # error "__cpp_lib_void_t should have the value 201411L in c++20" # endif -#endif // TEST_STD_VER == 20 +#elif TEST_STD_VER > 20 + +# ifndef __cpp_lib_bool_constant +# error "__cpp_lib_bool_constant should be defined in c++2b" +# endif +# if __cpp_lib_bool_constant != 201505L +# error "__cpp_lib_bool_constant should have the value 201505L in c++2b" +# endif + +# if TEST_HAS_BUILTIN_IDENTIFIER(__has_unique_object_representations) || TEST_GCC_VER >= 700 +# ifndef __cpp_lib_has_unique_object_representations +# error "__cpp_lib_has_unique_object_representations should be defined in c++2b" +# endif +# if __cpp_lib_has_unique_object_representations != 201606L +# error "__cpp_lib_has_unique_object_representations should have the value 201606L in c++2b" +# endif +# else +# ifdef __cpp_lib_has_unique_object_representations +# error "__cpp_lib_has_unique_object_representations should not be defined when TEST_HAS_BUILTIN_IDENTIFIER(__has_unique_object_representations) || TEST_GCC_VER >= 700 is not defined!" +# endif +# endif + +# ifndef __cpp_lib_integral_constant_callable +# error "__cpp_lib_integral_constant_callable should be defined in c++2b" +# endif +# if __cpp_lib_integral_constant_callable != 201304L +# error "__cpp_lib_integral_constant_callable should have the value 201304L in c++2b" +# endif + +# if TEST_HAS_BUILTIN_IDENTIFIER(__is_aggregate) || TEST_GCC_VER_NEW >= 7001 +# ifndef __cpp_lib_is_aggregate +# error "__cpp_lib_is_aggregate should be defined in c++2b" +# endif +# if __cpp_lib_is_aggregate != 201703L +# error "__cpp_lib_is_aggregate should have the value 201703L in c++2b" +# endif +# else +# ifdef __cpp_lib_is_aggregate +# error "__cpp_lib_is_aggregate should not be defined when TEST_HAS_BUILTIN_IDENTIFIER(__is_aggregate) || TEST_GCC_VER_NEW >= 7001 is not defined!" +# endif +# endif + +# if TEST_HAS_BUILTIN(__builtin_is_constant_evaluated) || TEST_GCC_VER >= 900 +# ifndef __cpp_lib_is_constant_evaluated +# error "__cpp_lib_is_constant_evaluated should be defined in c++2b" +# endif +# if __cpp_lib_is_constant_evaluated != 201811L +# error "__cpp_lib_is_constant_evaluated should have the value 201811L in c++2b" +# endif +# else +# ifdef __cpp_lib_is_constant_evaluated +# error "__cpp_lib_is_constant_evaluated should not be defined when TEST_HAS_BUILTIN(__builtin_is_constant_evaluated) || TEST_GCC_VER >= 900 is not defined!" +# endif +# endif + +# ifndef __cpp_lib_is_final +# error "__cpp_lib_is_final should be defined in c++2b" +# endif +# if __cpp_lib_is_final != 201402L +# error "__cpp_lib_is_final should have the value 201402L in c++2b" +# endif + +# ifndef __cpp_lib_is_invocable +# error "__cpp_lib_is_invocable should be defined in c++2b" +# endif +# if __cpp_lib_is_invocable != 201703L +# error "__cpp_lib_is_invocable should have the value 201703L in c++2b" +# endif + +# ifndef __cpp_lib_is_null_pointer +# error "__cpp_lib_is_null_pointer should be defined in c++2b" +# endif +# if __cpp_lib_is_null_pointer != 201309L +# error "__cpp_lib_is_null_pointer should have the value 201309L in c++2b" +# endif + +# ifndef __cpp_lib_is_swappable +# error "__cpp_lib_is_swappable should be defined in c++2b" +# endif +# if __cpp_lib_is_swappable != 201603L +# error "__cpp_lib_is_swappable should have the value 201603L in c++2b" +# endif + +# ifndef __cpp_lib_logical_traits +# error "__cpp_lib_logical_traits should be defined in c++2b" +# endif +# if __cpp_lib_logical_traits != 201510L +# error "__cpp_lib_logical_traits should have the value 201510L in c++2b" +# endif + +# ifndef __cpp_lib_result_of_sfinae +# error "__cpp_lib_result_of_sfinae should be defined in c++2b" +# endif +# if __cpp_lib_result_of_sfinae != 201210L +# error "__cpp_lib_result_of_sfinae should have the value 201210L in c++2b" +# endif + +# ifndef __cpp_lib_transformation_trait_aliases +# error "__cpp_lib_transformation_trait_aliases should be defined in c++2b" +# endif +# if __cpp_lib_transformation_trait_aliases != 201304L +# error "__cpp_lib_transformation_trait_aliases should have the value 201304L in c++2b" +# endif + +# ifndef __cpp_lib_type_trait_variable_templates +# error "__cpp_lib_type_trait_variable_templates should be defined in c++2b" +# endif +# if __cpp_lib_type_trait_variable_templates != 201510L +# error "__cpp_lib_type_trait_variable_templates should have the value 201510L in c++2b" +# endif + +# ifndef __cpp_lib_void_t +# error "__cpp_lib_void_t should be defined in c++2b" +# endif +# if __cpp_lib_void_t != 201411L +# error "__cpp_lib_void_t should have the value 201411L in c++2b" +# endif + +#endif // TEST_STD_VER > 20 int main(int, char**) { return 0; } Index: libcxx/test/std/language.support/support.limits/support.limits.general/unordered_map.version.pass.cpp =================================================================== --- libcxx/test/std/language.support/support.limits/support.limits.general/unordered_map.version.pass.cpp +++ libcxx/test/std/language.support/support.limits/support.limits.general/unordered_map.version.pass.cpp @@ -159,6 +159,50 @@ # error "__cpp_lib_unordered_map_try_emplace should have the value 201411L in c++20" # endif -#endif // TEST_STD_VER == 20 +#elif TEST_STD_VER > 20 + +# ifndef __cpp_lib_allocator_traits_is_always_equal +# error "__cpp_lib_allocator_traits_is_always_equal should be defined in c++2b" +# endif +# if __cpp_lib_allocator_traits_is_always_equal != 201411L +# error "__cpp_lib_allocator_traits_is_always_equal should have the value 201411L in c++2b" +# endif + +# ifndef __cpp_lib_erase_if +# error "__cpp_lib_erase_if should be defined in c++2b" +# endif +# if __cpp_lib_erase_if != 202002L +# error "__cpp_lib_erase_if should have the value 202002L in c++2b" +# endif + +# ifndef __cpp_lib_generic_unordered_lookup +# error "__cpp_lib_generic_unordered_lookup should be defined in c++2b" +# endif +# if __cpp_lib_generic_unordered_lookup != 201811L +# error "__cpp_lib_generic_unordered_lookup should have the value 201811L in c++2b" +# endif + +# ifndef __cpp_lib_node_extract +# error "__cpp_lib_node_extract should be defined in c++2b" +# endif +# if __cpp_lib_node_extract != 201606L +# error "__cpp_lib_node_extract should have the value 201606L in c++2b" +# endif + +# ifndef __cpp_lib_nonmember_container_access +# error "__cpp_lib_nonmember_container_access should be defined in c++2b" +# endif +# if __cpp_lib_nonmember_container_access != 201411L +# error "__cpp_lib_nonmember_container_access should have the value 201411L in c++2b" +# endif + +# ifndef __cpp_lib_unordered_map_try_emplace +# error "__cpp_lib_unordered_map_try_emplace should be defined in c++2b" +# endif +# if __cpp_lib_unordered_map_try_emplace != 201411L +# error "__cpp_lib_unordered_map_try_emplace should have the value 201411L in c++2b" +# endif + +#endif // TEST_STD_VER > 20 int main(int, char**) { return 0; } Index: libcxx/test/std/language.support/support.limits/support.limits.general/unordered_set.version.pass.cpp =================================================================== --- libcxx/test/std/language.support/support.limits/support.limits.general/unordered_set.version.pass.cpp +++ libcxx/test/std/language.support/support.limits/support.limits.general/unordered_set.version.pass.cpp @@ -136,6 +136,43 @@ # error "__cpp_lib_nonmember_container_access should have the value 201411L in c++20" # endif -#endif // TEST_STD_VER == 20 +#elif TEST_STD_VER > 20 + +# ifndef __cpp_lib_allocator_traits_is_always_equal +# error "__cpp_lib_allocator_traits_is_always_equal should be defined in c++2b" +# endif +# if __cpp_lib_allocator_traits_is_always_equal != 201411L +# error "__cpp_lib_allocator_traits_is_always_equal should have the value 201411L in c++2b" +# endif + +# ifndef __cpp_lib_erase_if +# error "__cpp_lib_erase_if should be defined in c++2b" +# endif +# if __cpp_lib_erase_if != 202002L +# error "__cpp_lib_erase_if should have the value 202002L in c++2b" +# endif + +# ifndef __cpp_lib_generic_unordered_lookup +# error "__cpp_lib_generic_unordered_lookup should be defined in c++2b" +# endif +# if __cpp_lib_generic_unordered_lookup != 201811L +# error "__cpp_lib_generic_unordered_lookup should have the value 201811L in c++2b" +# endif + +# ifndef __cpp_lib_node_extract +# error "__cpp_lib_node_extract should be defined in c++2b" +# endif +# if __cpp_lib_node_extract != 201606L +# error "__cpp_lib_node_extract should have the value 201606L in c++2b" +# endif + +# ifndef __cpp_lib_nonmember_container_access +# error "__cpp_lib_nonmember_container_access should be defined in c++2b" +# endif +# if __cpp_lib_nonmember_container_access != 201411L +# error "__cpp_lib_nonmember_container_access should have the value 201411L in c++2b" +# endif + +#endif // TEST_STD_VER > 20 int main(int, char**) { return 0; } Index: libcxx/test/std/language.support/support.limits/support.limits.general/utility.version.pass.cpp =================================================================== --- libcxx/test/std/language.support/support.limits/support.limits.general/utility.version.pass.cpp +++ libcxx/test/std/language.support/support.limits/support.limits.general/utility.version.pass.cpp @@ -183,6 +183,56 @@ # error "__cpp_lib_tuples_by_type should have the value 201304L in c++20" # endif -#endif // TEST_STD_VER == 20 +#elif TEST_STD_VER > 20 + +# ifndef __cpp_lib_as_const +# error "__cpp_lib_as_const should be defined in c++2b" +# endif +# if __cpp_lib_as_const != 201510L +# error "__cpp_lib_as_const should have the value 201510L in c++2b" +# endif + +# ifndef __cpp_lib_constexpr_utility +# error "__cpp_lib_constexpr_utility should be defined in c++2b" +# endif +# if __cpp_lib_constexpr_utility != 201811L +# error "__cpp_lib_constexpr_utility should have the value 201811L in c++2b" +# endif + +# ifndef __cpp_lib_exchange_function +# error "__cpp_lib_exchange_function should be defined in c++2b" +# endif +# if __cpp_lib_exchange_function != 201304L +# error "__cpp_lib_exchange_function should have the value 201304L in c++2b" +# endif + +# ifndef __cpp_lib_integer_sequence +# error "__cpp_lib_integer_sequence should be defined in c++2b" +# endif +# if __cpp_lib_integer_sequence != 201304L +# error "__cpp_lib_integer_sequence should have the value 201304L in c++2b" +# endif + +# if !defined(_LIBCPP_VERSION) +# ifndef __cpp_lib_to_chars +# error "__cpp_lib_to_chars should be defined in c++2b" +# endif +# if __cpp_lib_to_chars != 201611L +# error "__cpp_lib_to_chars should have the value 201611L in c++2b" +# endif +# else // _LIBCPP_VERSION +# ifdef __cpp_lib_to_chars +# error "__cpp_lib_to_chars should not be defined because it is unimplemented in libc++!" +# endif +# endif + +# ifndef __cpp_lib_tuples_by_type +# error "__cpp_lib_tuples_by_type should be defined in c++2b" +# endif +# if __cpp_lib_tuples_by_type != 201304L +# error "__cpp_lib_tuples_by_type should have the value 201304L in c++2b" +# endif + +#endif // TEST_STD_VER > 20 int main(int, char**) { return 0; } Index: libcxx/test/std/language.support/support.limits/support.limits.general/variant.version.pass.cpp =================================================================== --- libcxx/test/std/language.support/support.limits/support.limits.general/variant.version.pass.cpp +++ libcxx/test/std/language.support/support.limits/support.limits.general/variant.version.pass.cpp @@ -50,6 +50,15 @@ # error "__cpp_lib_variant should have the value 201606L in c++20" # endif -#endif // TEST_STD_VER == 20 +#elif TEST_STD_VER > 20 + +# ifndef __cpp_lib_variant +# error "__cpp_lib_variant should be defined in c++2b" +# endif +# if __cpp_lib_variant != 201606L +# error "__cpp_lib_variant should have the value 201606L in c++2b" +# endif + +#endif // TEST_STD_VER > 20 int main(int, char**) { return 0; } Index: libcxx/test/std/language.support/support.limits/support.limits.general/vector.version.pass.cpp =================================================================== --- libcxx/test/std/language.support/support.limits/support.limits.general/vector.version.pass.cpp +++ libcxx/test/std/language.support/support.limits/support.limits.general/vector.version.pass.cpp @@ -116,6 +116,36 @@ # error "__cpp_lib_nonmember_container_access should have the value 201411L in c++20" # endif -#endif // TEST_STD_VER == 20 +#elif TEST_STD_VER > 20 + +# ifndef __cpp_lib_allocator_traits_is_always_equal +# error "__cpp_lib_allocator_traits_is_always_equal should be defined in c++2b" +# endif +# if __cpp_lib_allocator_traits_is_always_equal != 201411L +# error "__cpp_lib_allocator_traits_is_always_equal should have the value 201411L in c++2b" +# endif + +# ifndef __cpp_lib_erase_if +# error "__cpp_lib_erase_if should be defined in c++2b" +# endif +# if __cpp_lib_erase_if != 202002L +# error "__cpp_lib_erase_if should have the value 202002L in c++2b" +# endif + +# ifndef __cpp_lib_incomplete_container_elements +# error "__cpp_lib_incomplete_container_elements should be defined in c++2b" +# endif +# if __cpp_lib_incomplete_container_elements != 201505L +# error "__cpp_lib_incomplete_container_elements should have the value 201505L in c++2b" +# endif + +# ifndef __cpp_lib_nonmember_container_access +# error "__cpp_lib_nonmember_container_access should be defined in c++2b" +# endif +# if __cpp_lib_nonmember_container_access != 201411L +# error "__cpp_lib_nonmember_container_access should have the value 201411L in c++2b" +# endif + +#endif // TEST_STD_VER > 20 int main(int, char**) { return 0; } Index: libcxx/test/std/language.support/support.limits/support.limits.general/version.version.pass.cpp =================================================================== --- libcxx/test/std/language.support/support.limits/support.limits.general/version.version.pass.cpp +++ libcxx/test/std/language.support/support.limits/support.limits.general/version.version.pass.cpp @@ -98,6 +98,7 @@ __cpp_lib_shared_ptr_weak_type 201606L [C++17] __cpp_lib_shared_timed_mutex 201402L [C++14] __cpp_lib_span 202002L [C++20] + __cpp_lib_string_contains 202011L [C++2b] __cpp_lib_string_udls 201304L [C++14] __cpp_lib_string_view 201606L [C++17] __cpp_lib_three_way_comparison 201711L [C++20] @@ -452,6 +453,10 @@ # error "__cpp_lib_span should not be defined before c++20" # endif +# ifdef __cpp_lib_string_contains +# error "__cpp_lib_string_contains should not be defined before c++2b" +# endif + # ifdef __cpp_lib_string_udls # error "__cpp_lib_string_udls should not be defined before c++14" # endif @@ -893,6 +898,10 @@ # error "__cpp_lib_span should not be defined before c++20" # endif +# ifdef __cpp_lib_string_contains +# error "__cpp_lib_string_contains should not be defined before c++2b" +# endif + # ifndef __cpp_lib_string_udls # error "__cpp_lib_string_udls should be defined in c++14" # endif @@ -1538,6 +1547,10 @@ # error "__cpp_lib_span should not be defined before c++20" # endif +# ifdef __cpp_lib_string_contains +# error "__cpp_lib_string_contains should not be defined before c++2b" +# endif + # ifndef __cpp_lib_string_udls # error "__cpp_lib_string_udls should be defined in c++17" # endif @@ -2387,6 +2400,10 @@ # error "__cpp_lib_span should have the value 202002L in c++20" # endif +# ifdef __cpp_lib_string_contains +# error "__cpp_lib_string_contains should not be defined before c++2b" +# endif + # ifndef __cpp_lib_string_udls # error "__cpp_lib_string_udls should be defined in c++20" # endif @@ -2497,6 +2514,874 @@ # error "__cpp_lib_void_t should have the value 201411L in c++20" # endif -#endif // TEST_STD_VER == 20 +#elif TEST_STD_VER > 20 + +# if TEST_HAS_BUILTIN(__builtin_addressof) || TEST_GCC_VER >= 700 +# ifndef __cpp_lib_addressof_constexpr +# error "__cpp_lib_addressof_constexpr should be defined in c++2b" +# endif +# if __cpp_lib_addressof_constexpr != 201603L +# error "__cpp_lib_addressof_constexpr should have the value 201603L in c++2b" +# endif +# else +# ifdef __cpp_lib_addressof_constexpr +# error "__cpp_lib_addressof_constexpr should not be defined when TEST_HAS_BUILTIN(__builtin_addressof) || TEST_GCC_VER >= 700 is not defined!" +# endif +# endif + +# ifndef __cpp_lib_allocator_traits_is_always_equal +# error "__cpp_lib_allocator_traits_is_always_equal should be defined in c++2b" +# endif +# if __cpp_lib_allocator_traits_is_always_equal != 201411L +# error "__cpp_lib_allocator_traits_is_always_equal should have the value 201411L in c++2b" +# endif + +# ifndef __cpp_lib_any +# error "__cpp_lib_any should be defined in c++2b" +# endif +# if __cpp_lib_any != 201606L +# error "__cpp_lib_any should have the value 201606L in c++2b" +# endif + +# ifndef __cpp_lib_apply +# error "__cpp_lib_apply should be defined in c++2b" +# endif +# if __cpp_lib_apply != 201603L +# error "__cpp_lib_apply should have the value 201603L in c++2b" +# endif + +# ifndef __cpp_lib_array_constexpr +# error "__cpp_lib_array_constexpr should be defined in c++2b" +# endif +# if __cpp_lib_array_constexpr != 201811L +# error "__cpp_lib_array_constexpr should have the value 201811L in c++2b" +# endif + +# ifndef __cpp_lib_as_const +# error "__cpp_lib_as_const should be defined in c++2b" +# endif +# if __cpp_lib_as_const != 201510L +# error "__cpp_lib_as_const should have the value 201510L in c++2b" +# endif + +# if !defined(_LIBCPP_HAS_NO_THREADS) +# ifndef __cpp_lib_atomic_flag_test +# error "__cpp_lib_atomic_flag_test should be defined in c++2b" +# endif +# if __cpp_lib_atomic_flag_test != 201907L +# error "__cpp_lib_atomic_flag_test should have the value 201907L in c++2b" +# endif +# else +# ifdef __cpp_lib_atomic_flag_test +# error "__cpp_lib_atomic_flag_test should not be defined when !defined(_LIBCPP_HAS_NO_THREADS) is not defined!" +# endif +# endif + +# if !defined(_LIBCPP_VERSION) +# ifndef __cpp_lib_atomic_float +# error "__cpp_lib_atomic_float should be defined in c++2b" +# endif +# if __cpp_lib_atomic_float != 201711L +# error "__cpp_lib_atomic_float should have the value 201711L in c++2b" +# endif +# else // _LIBCPP_VERSION +# ifdef __cpp_lib_atomic_float +# error "__cpp_lib_atomic_float should not be defined because it is unimplemented in libc++!" +# endif +# endif + +# if !defined(_LIBCPP_HAS_NO_THREADS) +# ifndef __cpp_lib_atomic_is_always_lock_free +# error "__cpp_lib_atomic_is_always_lock_free should be defined in c++2b" +# endif +# if __cpp_lib_atomic_is_always_lock_free != 201603L +# error "__cpp_lib_atomic_is_always_lock_free should have the value 201603L in c++2b" +# endif +# else +# ifdef __cpp_lib_atomic_is_always_lock_free +# error "__cpp_lib_atomic_is_always_lock_free should not be defined when !defined(_LIBCPP_HAS_NO_THREADS) is not defined!" +# endif +# endif + +# if !defined(_LIBCPP_HAS_NO_THREADS) +# ifndef __cpp_lib_atomic_lock_free_type_aliases +# error "__cpp_lib_atomic_lock_free_type_aliases should be defined in c++2b" +# endif +# if __cpp_lib_atomic_lock_free_type_aliases != 201907L +# error "__cpp_lib_atomic_lock_free_type_aliases should have the value 201907L in c++2b" +# endif +# else +# ifdef __cpp_lib_atomic_lock_free_type_aliases +# error "__cpp_lib_atomic_lock_free_type_aliases should not be defined when !defined(_LIBCPP_HAS_NO_THREADS) is not defined!" +# endif +# endif + +# if !defined(_LIBCPP_VERSION) +# ifndef __cpp_lib_atomic_ref +# error "__cpp_lib_atomic_ref should be defined in c++2b" +# endif +# if __cpp_lib_atomic_ref != 201806L +# error "__cpp_lib_atomic_ref should have the value 201806L in c++2b" +# endif +# else // _LIBCPP_VERSION +# ifdef __cpp_lib_atomic_ref +# error "__cpp_lib_atomic_ref should not be defined because it is unimplemented in libc++!" +# endif +# endif + +# if !defined(_LIBCPP_VERSION) +# ifndef __cpp_lib_atomic_shared_ptr +# error "__cpp_lib_atomic_shared_ptr should be defined in c++2b" +# endif +# if __cpp_lib_atomic_shared_ptr != 201711L +# error "__cpp_lib_atomic_shared_ptr should have the value 201711L in c++2b" +# endif +# else // _LIBCPP_VERSION +# ifdef __cpp_lib_atomic_shared_ptr +# error "__cpp_lib_atomic_shared_ptr should not be defined because it is unimplemented in libc++!" +# endif +# endif + +# if !defined(_LIBCPP_VERSION) +# ifndef __cpp_lib_atomic_value_initialization +# error "__cpp_lib_atomic_value_initialization should be defined in c++2b" +# endif +# if __cpp_lib_atomic_value_initialization != 201911L +# error "__cpp_lib_atomic_value_initialization should have the value 201911L in c++2b" +# endif +# else // _LIBCPP_VERSION +# ifdef __cpp_lib_atomic_value_initialization +# error "__cpp_lib_atomic_value_initialization should not be defined because it is unimplemented in libc++!" +# endif +# endif + +# if !defined(_LIBCPP_HAS_NO_THREADS) +# ifndef __cpp_lib_atomic_wait +# error "__cpp_lib_atomic_wait should be defined in c++2b" +# endif +# if __cpp_lib_atomic_wait != 201907L +# error "__cpp_lib_atomic_wait should have the value 201907L in c++2b" +# endif +# else +# ifdef __cpp_lib_atomic_wait +# error "__cpp_lib_atomic_wait should not be defined when !defined(_LIBCPP_HAS_NO_THREADS) is not defined!" +# endif +# endif + +# if !defined(_LIBCPP_VERSION) +# ifndef __cpp_lib_bind_front +# error "__cpp_lib_bind_front should be defined in c++2b" +# endif +# if __cpp_lib_bind_front != 201811L +# error "__cpp_lib_bind_front should have the value 201811L in c++2b" +# endif +# else // _LIBCPP_VERSION +# ifdef __cpp_lib_bind_front +# error "__cpp_lib_bind_front should not be defined because it is unimplemented in libc++!" +# endif +# endif + +# if !defined(_LIBCPP_VERSION) +# ifndef __cpp_lib_bit_cast +# error "__cpp_lib_bit_cast should be defined in c++2b" +# endif +# if __cpp_lib_bit_cast != 201806L +# error "__cpp_lib_bit_cast should have the value 201806L in c++2b" +# endif +# else // _LIBCPP_VERSION +# ifdef __cpp_lib_bit_cast +# error "__cpp_lib_bit_cast should not be defined because it is unimplemented in libc++!" +# endif +# endif + +# ifndef __cpp_lib_bool_constant +# error "__cpp_lib_bool_constant should be defined in c++2b" +# endif +# if __cpp_lib_bool_constant != 201505L +# error "__cpp_lib_bool_constant should have the value 201505L in c++2b" +# endif + +# if !defined(_LIBCPP_VERSION) +# ifndef __cpp_lib_boyer_moore_searcher +# error "__cpp_lib_boyer_moore_searcher should be defined in c++2b" +# endif +# if __cpp_lib_boyer_moore_searcher != 201603L +# error "__cpp_lib_boyer_moore_searcher should have the value 201603L in c++2b" +# endif +# else // _LIBCPP_VERSION +# ifdef __cpp_lib_boyer_moore_searcher +# error "__cpp_lib_boyer_moore_searcher should not be defined because it is unimplemented in libc++!" +# endif +# endif + +# ifndef __cpp_lib_byte +# error "__cpp_lib_byte should be defined in c++2b" +# endif +# if __cpp_lib_byte != 201603L +# error "__cpp_lib_byte should have the value 201603L in c++2b" +# endif + +# if defined(__cpp_char8_t) +# ifndef __cpp_lib_char8_t +# error "__cpp_lib_char8_t should be defined in c++2b" +# endif +# if __cpp_lib_char8_t != 201811L +# error "__cpp_lib_char8_t should have the value 201811L in c++2b" +# endif +# else +# ifdef __cpp_lib_char8_t +# error "__cpp_lib_char8_t should not be defined when defined(__cpp_char8_t) is not defined!" +# endif +# endif + +# ifndef __cpp_lib_chrono +# error "__cpp_lib_chrono should be defined in c++2b" +# endif +# if __cpp_lib_chrono != 201611L +# error "__cpp_lib_chrono should have the value 201611L in c++2b" +# endif + +# ifndef __cpp_lib_chrono_udls +# error "__cpp_lib_chrono_udls should be defined in c++2b" +# endif +# if __cpp_lib_chrono_udls != 201304L +# error "__cpp_lib_chrono_udls should have the value 201304L in c++2b" +# endif + +# ifndef __cpp_lib_clamp +# error "__cpp_lib_clamp should be defined in c++2b" +# endif +# if __cpp_lib_clamp != 201603L +# error "__cpp_lib_clamp should have the value 201603L in c++2b" +# endif + +# ifndef __cpp_lib_complex_udls +# error "__cpp_lib_complex_udls should be defined in c++2b" +# endif +# if __cpp_lib_complex_udls != 201309L +# error "__cpp_lib_complex_udls should have the value 201309L in c++2b" +# endif + +# if !defined(_LIBCPP_VERSION) +# ifndef __cpp_lib_concepts +# error "__cpp_lib_concepts should be defined in c++2b" +# endif +# if __cpp_lib_concepts != 201806L +# error "__cpp_lib_concepts should have the value 201806L in c++2b" +# endif +# else // _LIBCPP_VERSION +# ifdef __cpp_lib_concepts +# error "__cpp_lib_concepts should not be defined because it is unimplemented in libc++!" +# endif +# endif + +# ifndef __cpp_lib_constexpr_dynamic_alloc +# error "__cpp_lib_constexpr_dynamic_alloc should be defined in c++2b" +# endif +# if __cpp_lib_constexpr_dynamic_alloc != 201907L +# error "__cpp_lib_constexpr_dynamic_alloc should have the value 201907L in c++2b" +# endif + +# ifndef __cpp_lib_constexpr_functional +# error "__cpp_lib_constexpr_functional should be defined in c++2b" +# endif +# if __cpp_lib_constexpr_functional != 201907L +# error "__cpp_lib_constexpr_functional should have the value 201907L in c++2b" +# endif + +# ifndef __cpp_lib_constexpr_numeric +# error "__cpp_lib_constexpr_numeric should be defined in c++2b" +# endif +# if __cpp_lib_constexpr_numeric != 201911L +# error "__cpp_lib_constexpr_numeric should have the value 201911L in c++2b" +# endif + +# if !defined(_LIBCPP_VERSION) +# ifndef __cpp_lib_constexpr_swap_algorithms +# error "__cpp_lib_constexpr_swap_algorithms should be defined in c++2b" +# endif +# if __cpp_lib_constexpr_swap_algorithms != 201806L +# error "__cpp_lib_constexpr_swap_algorithms should have the value 201806L in c++2b" +# endif +# else // _LIBCPP_VERSION +# ifdef __cpp_lib_constexpr_swap_algorithms +# error "__cpp_lib_constexpr_swap_algorithms should not be defined because it is unimplemented in libc++!" +# endif +# endif + +# ifndef __cpp_lib_constexpr_utility +# error "__cpp_lib_constexpr_utility should be defined in c++2b" +# endif +# if __cpp_lib_constexpr_utility != 201811L +# error "__cpp_lib_constexpr_utility should have the value 201811L in c++2b" +# endif + +# if TEST_STD_VER > 17 && defined(__cpp_impl_destroying_delete) && __cpp_impl_destroying_delete >= 201806L +# ifndef __cpp_lib_destroying_delete +# error "__cpp_lib_destroying_delete should be defined in c++2b" +# endif +# if __cpp_lib_destroying_delete != 201806L +# error "__cpp_lib_destroying_delete should have the value 201806L in c++2b" +# endif +# else +# ifdef __cpp_lib_destroying_delete +# error "__cpp_lib_destroying_delete should not be defined when TEST_STD_VER > 17 && defined(__cpp_impl_destroying_delete) && __cpp_impl_destroying_delete >= 201806L is not defined!" +# endif +# endif + +# ifndef __cpp_lib_enable_shared_from_this +# error "__cpp_lib_enable_shared_from_this should be defined in c++2b" +# endif +# if __cpp_lib_enable_shared_from_this != 201603L +# error "__cpp_lib_enable_shared_from_this should have the value 201603L in c++2b" +# endif + +# ifndef __cpp_lib_endian +# error "__cpp_lib_endian should be defined in c++2b" +# endif +# if __cpp_lib_endian != 201907L +# error "__cpp_lib_endian should have the value 201907L in c++2b" +# endif + +# ifndef __cpp_lib_erase_if +# error "__cpp_lib_erase_if should be defined in c++2b" +# endif +# if __cpp_lib_erase_if != 202002L +# error "__cpp_lib_erase_if should have the value 202002L in c++2b" +# endif + +# ifndef __cpp_lib_exchange_function +# error "__cpp_lib_exchange_function should be defined in c++2b" +# endif +# if __cpp_lib_exchange_function != 201304L +# error "__cpp_lib_exchange_function should have the value 201304L in c++2b" +# endif + +# if !defined(_LIBCPP_VERSION) +# ifndef __cpp_lib_execution +# error "__cpp_lib_execution should be defined in c++2b" +# endif +# if __cpp_lib_execution != 201603L +# error "__cpp_lib_execution should have the value 201603L in c++2b" +# endif +# else // _LIBCPP_VERSION +# ifdef __cpp_lib_execution +# error "__cpp_lib_execution should not be defined because it is unimplemented in libc++!" +# endif +# endif + +# ifndef __cpp_lib_filesystem +# error "__cpp_lib_filesystem should be defined in c++2b" +# endif +# if __cpp_lib_filesystem != 201703L +# error "__cpp_lib_filesystem should have the value 201703L in c++2b" +# endif + +# ifndef __cpp_lib_gcd_lcm +# error "__cpp_lib_gcd_lcm should be defined in c++2b" +# endif +# if __cpp_lib_gcd_lcm != 201606L +# error "__cpp_lib_gcd_lcm should have the value 201606L in c++2b" +# endif + +# ifndef __cpp_lib_generic_associative_lookup +# error "__cpp_lib_generic_associative_lookup should be defined in c++2b" +# endif +# if __cpp_lib_generic_associative_lookup != 201304L +# error "__cpp_lib_generic_associative_lookup should have the value 201304L in c++2b" +# endif + +# ifndef __cpp_lib_generic_unordered_lookup +# error "__cpp_lib_generic_unordered_lookup should be defined in c++2b" +# endif +# if __cpp_lib_generic_unordered_lookup != 201811L +# error "__cpp_lib_generic_unordered_lookup should have the value 201811L in c++2b" +# endif + +# if !defined(_LIBCPP_VERSION) +# ifndef __cpp_lib_hardware_interference_size +# error "__cpp_lib_hardware_interference_size should be defined in c++2b" +# endif +# if __cpp_lib_hardware_interference_size != 201703L +# error "__cpp_lib_hardware_interference_size should have the value 201703L in c++2b" +# endif +# else // _LIBCPP_VERSION +# ifdef __cpp_lib_hardware_interference_size +# error "__cpp_lib_hardware_interference_size should not be defined because it is unimplemented in libc++!" +# endif +# endif + +# if TEST_HAS_BUILTIN_IDENTIFIER(__has_unique_object_representations) || TEST_GCC_VER >= 700 +# ifndef __cpp_lib_has_unique_object_representations +# error "__cpp_lib_has_unique_object_representations should be defined in c++2b" +# endif +# if __cpp_lib_has_unique_object_representations != 201606L +# error "__cpp_lib_has_unique_object_representations should have the value 201606L in c++2b" +# endif +# else +# ifdef __cpp_lib_has_unique_object_representations +# error "__cpp_lib_has_unique_object_representations should not be defined when TEST_HAS_BUILTIN_IDENTIFIER(__has_unique_object_representations) || TEST_GCC_VER >= 700 is not defined!" +# endif +# endif + +# ifndef __cpp_lib_hypot +# error "__cpp_lib_hypot should be defined in c++2b" +# endif +# if __cpp_lib_hypot != 201603L +# error "__cpp_lib_hypot should have the value 201603L in c++2b" +# endif + +# ifndef __cpp_lib_incomplete_container_elements +# error "__cpp_lib_incomplete_container_elements should be defined in c++2b" +# endif +# if __cpp_lib_incomplete_container_elements != 201505L +# error "__cpp_lib_incomplete_container_elements should have the value 201505L in c++2b" +# endif + +# ifndef __cpp_lib_int_pow2 +# error "__cpp_lib_int_pow2 should be defined in c++2b" +# endif +# if __cpp_lib_int_pow2 != 202002L +# error "__cpp_lib_int_pow2 should have the value 202002L in c++2b" +# endif + +# ifndef __cpp_lib_integer_sequence +# error "__cpp_lib_integer_sequence should be defined in c++2b" +# endif +# if __cpp_lib_integer_sequence != 201304L +# error "__cpp_lib_integer_sequence should have the value 201304L in c++2b" +# endif + +# ifndef __cpp_lib_integral_constant_callable +# error "__cpp_lib_integral_constant_callable should be defined in c++2b" +# endif +# if __cpp_lib_integral_constant_callable != 201304L +# error "__cpp_lib_integral_constant_callable should have the value 201304L in c++2b" +# endif + +# ifndef __cpp_lib_interpolate +# error "__cpp_lib_interpolate should be defined in c++2b" +# endif +# if __cpp_lib_interpolate != 201902L +# error "__cpp_lib_interpolate should have the value 201902L in c++2b" +# endif + +# ifndef __cpp_lib_invoke +# error "__cpp_lib_invoke should be defined in c++2b" +# endif +# if __cpp_lib_invoke != 201411L +# error "__cpp_lib_invoke should have the value 201411L in c++2b" +# endif + +# if TEST_HAS_BUILTIN_IDENTIFIER(__is_aggregate) || TEST_GCC_VER_NEW >= 7001 +# ifndef __cpp_lib_is_aggregate +# error "__cpp_lib_is_aggregate should be defined in c++2b" +# endif +# if __cpp_lib_is_aggregate != 201703L +# error "__cpp_lib_is_aggregate should have the value 201703L in c++2b" +# endif +# else +# ifdef __cpp_lib_is_aggregate +# error "__cpp_lib_is_aggregate should not be defined when TEST_HAS_BUILTIN_IDENTIFIER(__is_aggregate) || TEST_GCC_VER_NEW >= 7001 is not defined!" +# endif +# endif + +# if TEST_HAS_BUILTIN(__builtin_is_constant_evaluated) || TEST_GCC_VER >= 900 +# ifndef __cpp_lib_is_constant_evaluated +# error "__cpp_lib_is_constant_evaluated should be defined in c++2b" +# endif +# if __cpp_lib_is_constant_evaluated != 201811L +# error "__cpp_lib_is_constant_evaluated should have the value 201811L in c++2b" +# endif +# else +# ifdef __cpp_lib_is_constant_evaluated +# error "__cpp_lib_is_constant_evaluated should not be defined when TEST_HAS_BUILTIN(__builtin_is_constant_evaluated) || TEST_GCC_VER >= 900 is not defined!" +# endif +# endif + +# ifndef __cpp_lib_is_final +# error "__cpp_lib_is_final should be defined in c++2b" +# endif +# if __cpp_lib_is_final != 201402L +# error "__cpp_lib_is_final should have the value 201402L in c++2b" +# endif + +# ifndef __cpp_lib_is_invocable +# error "__cpp_lib_is_invocable should be defined in c++2b" +# endif +# if __cpp_lib_is_invocable != 201703L +# error "__cpp_lib_is_invocable should have the value 201703L in c++2b" +# endif + +# ifndef __cpp_lib_is_null_pointer +# error "__cpp_lib_is_null_pointer should be defined in c++2b" +# endif +# if __cpp_lib_is_null_pointer != 201309L +# error "__cpp_lib_is_null_pointer should have the value 201309L in c++2b" +# endif + +# ifndef __cpp_lib_is_swappable +# error "__cpp_lib_is_swappable should be defined in c++2b" +# endif +# if __cpp_lib_is_swappable != 201603L +# error "__cpp_lib_is_swappable should have the value 201603L in c++2b" +# endif + +# ifndef __cpp_lib_launder +# error "__cpp_lib_launder should be defined in c++2b" +# endif +# if __cpp_lib_launder != 201606L +# error "__cpp_lib_launder should have the value 201606L in c++2b" +# endif + +# ifndef __cpp_lib_list_remove_return_type +# error "__cpp_lib_list_remove_return_type should be defined in c++2b" +# endif +# if __cpp_lib_list_remove_return_type != 201806L +# error "__cpp_lib_list_remove_return_type should have the value 201806L in c++2b" +# endif + +# ifndef __cpp_lib_logical_traits +# error "__cpp_lib_logical_traits should be defined in c++2b" +# endif +# if __cpp_lib_logical_traits != 201510L +# error "__cpp_lib_logical_traits should have the value 201510L in c++2b" +# endif + +# ifndef __cpp_lib_make_from_tuple +# error "__cpp_lib_make_from_tuple should be defined in c++2b" +# endif +# if __cpp_lib_make_from_tuple != 201606L +# error "__cpp_lib_make_from_tuple should have the value 201606L in c++2b" +# endif + +# ifndef __cpp_lib_make_reverse_iterator +# error "__cpp_lib_make_reverse_iterator should be defined in c++2b" +# endif +# if __cpp_lib_make_reverse_iterator != 201402L +# error "__cpp_lib_make_reverse_iterator should have the value 201402L in c++2b" +# endif + +# ifndef __cpp_lib_make_unique +# error "__cpp_lib_make_unique should be defined in c++2b" +# endif +# if __cpp_lib_make_unique != 201304L +# error "__cpp_lib_make_unique should have the value 201304L in c++2b" +# endif + +# ifndef __cpp_lib_map_try_emplace +# error "__cpp_lib_map_try_emplace should be defined in c++2b" +# endif +# if __cpp_lib_map_try_emplace != 201411L +# error "__cpp_lib_map_try_emplace should have the value 201411L in c++2b" +# endif + +# if defined(__cpp_concepts) && __cpp_concepts >= 201811L +# ifndef __cpp_lib_math_constants +# error "__cpp_lib_math_constants should be defined in c++2b" +# endif +# if __cpp_lib_math_constants != 201907L +# error "__cpp_lib_math_constants should have the value 201907L in c++2b" +# endif +# else +# ifdef __cpp_lib_math_constants +# error "__cpp_lib_math_constants should not be defined when defined(__cpp_concepts) && __cpp_concepts >= 201811L is not defined!" +# endif +# endif + +# if !defined(_LIBCPP_VERSION) +# ifndef __cpp_lib_math_special_functions +# error "__cpp_lib_math_special_functions should be defined in c++2b" +# endif +# if __cpp_lib_math_special_functions != 201603L +# error "__cpp_lib_math_special_functions should have the value 201603L in c++2b" +# endif +# else // _LIBCPP_VERSION +# ifdef __cpp_lib_math_special_functions +# error "__cpp_lib_math_special_functions should not be defined because it is unimplemented in libc++!" +# endif +# endif + +# if !defined(_LIBCPP_VERSION) +# ifndef __cpp_lib_memory_resource +# error "__cpp_lib_memory_resource should be defined in c++2b" +# endif +# if __cpp_lib_memory_resource != 201603L +# error "__cpp_lib_memory_resource should have the value 201603L in c++2b" +# endif +# else // _LIBCPP_VERSION +# ifdef __cpp_lib_memory_resource +# error "__cpp_lib_memory_resource should not be defined because it is unimplemented in libc++!" +# endif +# endif + +# ifndef __cpp_lib_node_extract +# error "__cpp_lib_node_extract should be defined in c++2b" +# endif +# if __cpp_lib_node_extract != 201606L +# error "__cpp_lib_node_extract should have the value 201606L in c++2b" +# endif + +# ifndef __cpp_lib_nonmember_container_access +# error "__cpp_lib_nonmember_container_access should be defined in c++2b" +# endif +# if __cpp_lib_nonmember_container_access != 201411L +# error "__cpp_lib_nonmember_container_access should have the value 201411L in c++2b" +# endif + +# ifndef __cpp_lib_not_fn +# error "__cpp_lib_not_fn should be defined in c++2b" +# endif +# if __cpp_lib_not_fn != 201603L +# error "__cpp_lib_not_fn should have the value 201603L in c++2b" +# endif + +# ifndef __cpp_lib_null_iterators +# error "__cpp_lib_null_iterators should be defined in c++2b" +# endif +# if __cpp_lib_null_iterators != 201304L +# error "__cpp_lib_null_iterators should have the value 201304L in c++2b" +# endif + +# ifndef __cpp_lib_optional +# error "__cpp_lib_optional should be defined in c++2b" +# endif +# if __cpp_lib_optional != 201606L +# error "__cpp_lib_optional should have the value 201606L in c++2b" +# endif + +# if !defined(_LIBCPP_VERSION) +# ifndef __cpp_lib_parallel_algorithm +# error "__cpp_lib_parallel_algorithm should be defined in c++2b" +# endif +# if __cpp_lib_parallel_algorithm != 201603L +# error "__cpp_lib_parallel_algorithm should have the value 201603L in c++2b" +# endif +# else // _LIBCPP_VERSION +# ifdef __cpp_lib_parallel_algorithm +# error "__cpp_lib_parallel_algorithm should not be defined because it is unimplemented in libc++!" +# endif +# endif + +# ifndef __cpp_lib_quoted_string_io +# error "__cpp_lib_quoted_string_io should be defined in c++2b" +# endif +# if __cpp_lib_quoted_string_io != 201304L +# error "__cpp_lib_quoted_string_io should have the value 201304L in c++2b" +# endif + +# if !defined(_LIBCPP_VERSION) +# ifndef __cpp_lib_ranges +# error "__cpp_lib_ranges should be defined in c++2b" +# endif +# if __cpp_lib_ranges != 201811L +# error "__cpp_lib_ranges should have the value 201811L in c++2b" +# endif +# else // _LIBCPP_VERSION +# ifdef __cpp_lib_ranges +# error "__cpp_lib_ranges should not be defined because it is unimplemented in libc++!" +# endif +# endif + +# ifndef __cpp_lib_raw_memory_algorithms +# error "__cpp_lib_raw_memory_algorithms should be defined in c++2b" +# endif +# if __cpp_lib_raw_memory_algorithms != 201606L +# error "__cpp_lib_raw_memory_algorithms should have the value 201606L in c++2b" +# endif + +# ifndef __cpp_lib_result_of_sfinae +# error "__cpp_lib_result_of_sfinae should be defined in c++2b" +# endif +# if __cpp_lib_result_of_sfinae != 201210L +# error "__cpp_lib_result_of_sfinae should have the value 201210L in c++2b" +# endif + +# ifndef __cpp_lib_robust_nonmodifying_seq_ops +# error "__cpp_lib_robust_nonmodifying_seq_ops should be defined in c++2b" +# endif +# if __cpp_lib_robust_nonmodifying_seq_ops != 201304L +# error "__cpp_lib_robust_nonmodifying_seq_ops should have the value 201304L in c++2b" +# endif + +# ifndef __cpp_lib_sample +# error "__cpp_lib_sample should be defined in c++2b" +# endif +# if __cpp_lib_sample != 201603L +# error "__cpp_lib_sample should have the value 201603L in c++2b" +# endif + +# ifndef __cpp_lib_scoped_lock +# error "__cpp_lib_scoped_lock should be defined in c++2b" +# endif +# if __cpp_lib_scoped_lock != 201703L +# error "__cpp_lib_scoped_lock should have the value 201703L in c++2b" +# endif + +# if !defined(_LIBCPP_HAS_NO_THREADS) +# ifndef __cpp_lib_shared_mutex +# error "__cpp_lib_shared_mutex should be defined in c++2b" +# endif +# if __cpp_lib_shared_mutex != 201505L +# error "__cpp_lib_shared_mutex should have the value 201505L in c++2b" +# endif +# else +# ifdef __cpp_lib_shared_mutex +# error "__cpp_lib_shared_mutex should not be defined when !defined(_LIBCPP_HAS_NO_THREADS) is not defined!" +# endif +# endif + +# ifndef __cpp_lib_shared_ptr_arrays +# error "__cpp_lib_shared_ptr_arrays should be defined in c++2b" +# endif +# if __cpp_lib_shared_ptr_arrays != 201611L +# error "__cpp_lib_shared_ptr_arrays should have the value 201611L in c++2b" +# endif + +# ifndef __cpp_lib_shared_ptr_weak_type +# error "__cpp_lib_shared_ptr_weak_type should be defined in c++2b" +# endif +# if __cpp_lib_shared_ptr_weak_type != 201606L +# error "__cpp_lib_shared_ptr_weak_type should have the value 201606L in c++2b" +# endif + +# if !defined(_LIBCPP_HAS_NO_THREADS) +# ifndef __cpp_lib_shared_timed_mutex +# error "__cpp_lib_shared_timed_mutex should be defined in c++2b" +# endif +# if __cpp_lib_shared_timed_mutex != 201402L +# error "__cpp_lib_shared_timed_mutex should have the value 201402L in c++2b" +# endif +# else +# ifdef __cpp_lib_shared_timed_mutex +# error "__cpp_lib_shared_timed_mutex should not be defined when !defined(_LIBCPP_HAS_NO_THREADS) is not defined!" +# endif +# endif + +# ifndef __cpp_lib_span +# error "__cpp_lib_span should be defined in c++2b" +# endif +# if __cpp_lib_span != 202002L +# error "__cpp_lib_span should have the value 202002L in c++2b" +# endif + +# ifndef __cpp_lib_string_contains +# error "__cpp_lib_string_contains should be defined in c++2b" +# endif +# if __cpp_lib_string_contains != 202011L +# error "__cpp_lib_string_contains should have the value 202011L in c++2b" +# endif + +# ifndef __cpp_lib_string_udls +# error "__cpp_lib_string_udls should be defined in c++2b" +# endif +# if __cpp_lib_string_udls != 201304L +# error "__cpp_lib_string_udls should have the value 201304L in c++2b" +# endif + +# ifndef __cpp_lib_string_view +# error "__cpp_lib_string_view should be defined in c++2b" +# endif +# if __cpp_lib_string_view != 201606L +# error "__cpp_lib_string_view should have the value 201606L in c++2b" +# endif + +# if !defined(_LIBCPP_VERSION) +# ifndef __cpp_lib_three_way_comparison +# error "__cpp_lib_three_way_comparison should be defined in c++2b" +# endif +# if __cpp_lib_three_way_comparison != 201711L +# error "__cpp_lib_three_way_comparison should have the value 201711L in c++2b" +# endif +# else // _LIBCPP_VERSION +# ifdef __cpp_lib_three_way_comparison +# error "__cpp_lib_three_way_comparison should not be defined because it is unimplemented in libc++!" +# endif +# endif + +# ifndef __cpp_lib_to_array +# error "__cpp_lib_to_array should be defined in c++2b" +# endif +# if __cpp_lib_to_array != 201907L +# error "__cpp_lib_to_array should have the value 201907L in c++2b" +# endif + +# if !defined(_LIBCPP_VERSION) +# ifndef __cpp_lib_to_chars +# error "__cpp_lib_to_chars should be defined in c++2b" +# endif +# if __cpp_lib_to_chars != 201611L +# error "__cpp_lib_to_chars should have the value 201611L in c++2b" +# endif +# else // _LIBCPP_VERSION +# ifdef __cpp_lib_to_chars +# error "__cpp_lib_to_chars should not be defined because it is unimplemented in libc++!" +# endif +# endif + +# ifndef __cpp_lib_transformation_trait_aliases +# error "__cpp_lib_transformation_trait_aliases should be defined in c++2b" +# endif +# if __cpp_lib_transformation_trait_aliases != 201304L +# error "__cpp_lib_transformation_trait_aliases should have the value 201304L in c++2b" +# endif + +# ifndef __cpp_lib_transparent_operators +# error "__cpp_lib_transparent_operators should be defined in c++2b" +# endif +# if __cpp_lib_transparent_operators != 201510L +# error "__cpp_lib_transparent_operators should have the value 201510L in c++2b" +# endif + +# ifndef __cpp_lib_tuple_element_t +# error "__cpp_lib_tuple_element_t should be defined in c++2b" +# endif +# if __cpp_lib_tuple_element_t != 201402L +# error "__cpp_lib_tuple_element_t should have the value 201402L in c++2b" +# endif + +# ifndef __cpp_lib_tuples_by_type +# error "__cpp_lib_tuples_by_type should be defined in c++2b" +# endif +# if __cpp_lib_tuples_by_type != 201304L +# error "__cpp_lib_tuples_by_type should have the value 201304L in c++2b" +# endif + +# ifndef __cpp_lib_type_trait_variable_templates +# error "__cpp_lib_type_trait_variable_templates should be defined in c++2b" +# endif +# if __cpp_lib_type_trait_variable_templates != 201510L +# error "__cpp_lib_type_trait_variable_templates should have the value 201510L in c++2b" +# endif + +# ifndef __cpp_lib_uncaught_exceptions +# error "__cpp_lib_uncaught_exceptions should be defined in c++2b" +# endif +# if __cpp_lib_uncaught_exceptions != 201411L +# error "__cpp_lib_uncaught_exceptions should have the value 201411L in c++2b" +# endif + +# ifndef __cpp_lib_unordered_map_try_emplace +# error "__cpp_lib_unordered_map_try_emplace should be defined in c++2b" +# endif +# if __cpp_lib_unordered_map_try_emplace != 201411L +# error "__cpp_lib_unordered_map_try_emplace should have the value 201411L in c++2b" +# endif + +# ifndef __cpp_lib_variant +# error "__cpp_lib_variant should be defined in c++2b" +# endif +# if __cpp_lib_variant != 201606L +# error "__cpp_lib_variant should have the value 201606L in c++2b" +# endif + +# ifndef __cpp_lib_void_t +# error "__cpp_lib_void_t should be defined in c++2b" +# endif +# if __cpp_lib_void_t != 201411L +# error "__cpp_lib_void_t should have the value 201411L in c++2b" +# endif + +#endif // TEST_STD_VER > 20 int main(int, char**) { return 0; } Index: libcxx/test/std/strings/basic.string/string.contains/contains.char.pass.cpp =================================================================== --- /dev/null +++ libcxx/test/std/strings/basic.string/string.contains/contains.char.pass.cpp @@ -0,0 +1,44 @@ +//===----------------------------------------------------------------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// +// UNSUPPORTED: c++03, c++11, c++14, c++17, c++20 + +// + +// bool contains(charT x) const noexcept; + +#include +#include + +#include "test_macros.h" + +constexpr bool test() +{ + using S = std::string; + + S s1 {}; + S s2 {"abcde", 5}; + + ASSERT_NOEXCEPT(s1.contains('e')); + + assert(!s1.contains('c')); + assert(!s1.contains('e')); + assert(!s1.contains('x')); + assert( s2.contains('c')); + assert( s2.contains('e')); + assert(!s2.contains('x')); + + return true; +} + +int main(int, char**) +{ + test(); + static_assert(test()); + + return 0; +} Index: libcxx/test/std/strings/basic.string/string.contains/contains.ptr.pass.cpp =================================================================== --- /dev/null +++ libcxx/test/std/strings/basic.string/string.contains/contains.ptr.pass.cpp @@ -0,0 +1,73 @@ +//===----------------------------------------------------------------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// +// UNSUPPORTED: c++03, c++11, c++14, c++17, c++20 + +// + +// bool contains(const CharT *x) const; + +#include +#include + +#include "test_macros.h" + +constexpr bool test() +{ + using S = std::string; + + const char* s = "abcde"; + S s0; + S s1 {s + 4, 1}; + S s3 {s + 2, 3}; + S sNot {"xyz", 3}; + + LIBCPP_ASSERT_NOEXCEPT(s0.contains("")); + + assert(s0.contains("")); + assert(!s0.contains("e")); + + assert( s1.contains("")); + assert(!s1.contains("d")); + assert( s1.contains("e")); + assert(!s1.contains("de")); + assert(!s1.contains("cd")); + assert(!s1.contains("cde")); + assert(!s1.contains("bcde")); + assert(!s1.contains("abcde")); + assert(!s1.contains("xyz")); + + assert( s3.contains("")); + assert( s3.contains("d")); + assert( s3.contains("e")); + assert( s3.contains("de")); + assert( s3.contains("cd")); + assert( s3.contains("cde")); + assert(!s3.contains("bcde")); + assert(!s3.contains("abcde")); + assert(!s3.contains("xyz")); + + assert( sNot.contains("")); + assert(!sNot.contains("d")); + assert(!sNot.contains("e")); + assert(!sNot.contains("de")); + assert(!sNot.contains("cd")); + assert(!sNot.contains("cde")); + assert(!sNot.contains("bcde")); + assert(!sNot.contains("abcde")); + assert( sNot.contains("xyz")); + + return true; +} + +int main(int, char**) +{ + test(); + static_assert(test()); + + return 0; +} Index: libcxx/test/std/strings/basic.string/string.contains/contains.string_view.pass.cpp =================================================================== --- /dev/null +++ libcxx/test/std/strings/basic.string/string.contains/contains.string_view.pass.cpp @@ -0,0 +1,85 @@ +//===----------------------------------------------------------------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// +// UNSUPPORTED: c++03, c++11, c++14, c++17, c++20 + +// + +// bool contains(basic_string_view x) const noexcept; + +#include +#include + +#include "test_macros.h" + +constexpr bool test() +{ + using S = std::string; + using SV = std::string_view; + + const char* s = "abcde"; + S s0; + S s1 {s + 1, 1}; + S s3 {s + 1, 3}; + S s5 {s , 5}; + S sNot {"xyz", 3}; + + SV sv0; + SV sv1 {s + 1, 1}; + SV sv2 {s + 1, 2}; + SV sv3 {s + 1, 3}; + SV sv4 {s + 1, 4}; + SV sv5 {s , 5}; + SV svNot {"xyz", 3}; + + ASSERT_NOEXCEPT(s0.contains(sv0)); + + assert( s0.contains(sv0)); + assert(!s0.contains(sv1)); + + assert( s1.contains(sv0)); + assert( s1.contains(sv1)); + assert(!s1.contains(sv2)); + assert(!s1.contains(sv3)); + assert(!s1.contains(sv4)); + assert(!s1.contains(sv5)); + assert(!s1.contains(svNot)); + + assert( s3.contains(sv0)); + assert( s3.contains(sv1)); + assert( s3.contains(sv2)); + assert( s3.contains(sv3)); + assert(!s3.contains(sv4)); + assert(!s3.contains(sv5)); + assert(!s3.contains(svNot)); + + assert( s5.contains(sv0)); + assert( s5.contains(sv1)); + assert( s5.contains(sv2)); + assert( s5.contains(sv3)); + assert( s5.contains(sv4)); + assert( s5.contains(sv5)); + assert(!s5.contains(svNot)); + + assert( sNot.contains(sv0)); + assert(!sNot.contains(sv1)); + assert(!sNot.contains(sv2)); + assert(!sNot.contains(sv3)); + assert(!sNot.contains(sv4)); + assert(!sNot.contains(sv5)); + assert( sNot.contains(svNot)); + + return true; +} + +int main(int, char**) +{ + test(); + static_assert(test()); + + return 0; +} Index: libcxx/test/std/strings/string.view/string.view.template/contains.char.pass.cpp =================================================================== --- /dev/null +++ libcxx/test/std/strings/string.view/string.view.template/contains.char.pass.cpp @@ -0,0 +1,44 @@ +//===----------------------------------------------------------------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// +// UNSUPPORTED: c++03, c++11, c++14, c++17, c++20 + +// + +// constexpr bool contains(charT x) const noexcept; + +#include +#include + +#include "test_macros.h" + +constexpr bool test() +{ + using SV = std::string_view; + + SV sv1 {}; + SV sv2 {"abcde", 5}; + + ASSERT_NOEXCEPT(sv1.contains('e')); + + assert(!sv1.contains('c')); + assert(!sv1.contains('e')); + assert(!sv1.contains('x')); + assert( sv2.contains('c')); + assert( sv2.contains('e')); + assert(!sv2.contains('x')); + + return true; +} + +int main(int, char**) +{ + test(); + static_assert(test()); + + return 0; +} Index: libcxx/test/std/strings/string.view/string.view.template/contains.ptr.pass.cpp =================================================================== --- /dev/null +++ libcxx/test/std/strings/string.view/string.view.template/contains.ptr.pass.cpp @@ -0,0 +1,73 @@ +//===----------------------------------------------------------------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// +// UNSUPPORTED: c++03, c++11, c++14, c++17, c++20 + +// + +// constexpr bool contains(const CharT *x) const; + +#include +#include + +#include "test_macros.h" + +constexpr bool test() +{ + using SV = std::string_view; + + const char* s = "abcde"; + SV sv0; + SV sv1 {s + 4, 1}; + SV sv3 {s + 2, 3}; + SV svNot {"xyz", 3}; + + LIBCPP_ASSERT_NOEXCEPT(sv0.contains("")); + + assert( sv0.contains("")); + assert(!sv0.contains("e")); + + assert( sv1.contains("")); + assert(!sv1.contains("d")); + assert( sv1.contains("e")); + assert(!sv1.contains("de")); + assert(!sv1.contains("cd")); + assert(!sv1.contains("cde")); + assert(!sv1.contains("bcde")); + assert(!sv1.contains("abcde")); + assert(!sv1.contains("xyz")); + + assert( sv3.contains("")); + assert( sv3.contains("d")); + assert( sv3.contains("e")); + assert( sv3.contains("de")); + assert( sv3.contains("cd")); + assert(!sv3.contains("cde")); + assert(!sv3.contains("bcde")); + assert(!sv3.contains("abcde")); + assert(!sv3.contains("xyz")); + + assert( svNot.contains("")); + assert(!svNot.contains("d")); + assert(!svNot.contains("e")); + assert(!svNot.contains("de")); + assert(!svNot.contains("cd")); + assert(!svNot.contains("cde")); + assert(!svNot.contains("bcde")); + assert(!svNot.contains("abcde")); + assert( svNot.contains("xyz")); + + return true; +} + +int main(int, char**) +{ + test(); + static_assert(test()); + + return 0; +} Index: libcxx/test/std/strings/string.view/string.view.template/contains.string_view.pass.cpp =================================================================== --- /dev/null +++ libcxx/test/std/strings/string.view/string.view.template/contains.string_view.pass.cpp @@ -0,0 +1,78 @@ +//===----------------------------------------------------------------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// +// UNSUPPORTED: c++03, c++11, c++14, c++17, c++20 + +// + +// constexpr bool contains(string_view x) const noexcept; + +#include +#include + +#include "test_macros.h" + +constexpr bool test() +{ + using SV = std::string_view; + + const char* s = "abcde"; + SV sv0; + SV sv1 {s + 1, 1}; + SV sv2 {s + 1, 2}; + SV sv3 {s + 1, 3}; + SV sv4 {s + 1, 4}; + SV sv5 {s , 5}; + SV svNot {"xyz", 3}; + + ASSERT_NOEXCEPT(sv0.contains(sv0)); + + assert( sv0.contains(sv0)); + assert(!sv0.contains(sv1)); + + assert( sv1.contains(sv0)); + assert( sv1.contains(sv1)); + assert(!sv1.contains(sv2)); + assert(!sv1.contains(sv3)); + assert(!sv1.contains(sv4)); + assert(!sv1.contains(sv5)); + assert(!sv1.contains(svNot)); + + assert( sv3.contains(sv0)); + assert( sv3.contains(sv1)); + assert( sv3.contains(sv2)); + assert( sv3.contains(sv3)); + assert(!sv3.contains(sv4)); + assert(!sv3.contains(sv5)); + assert(!sv3.contains(svNot)); + + assert( sv5.contains(sv0)); + assert( sv5.contains(sv1)); + assert( sv5.contains(sv2)); + assert( sv5.contains(sv3)); + assert( sv5.contains(sv4)); + assert( sv5.contains(sv5)); + assert(!sv5.contains(svNot)); + + assert( svNot.contains(sv0)); + assert(!svNot.contains(sv1)); + assert(!svNot.contains(sv2)); + assert(!svNot.contains(sv3)); + assert(!svNot.contains(sv4)); + assert(!svNot.contains(sv5)); + assert( svNot.contains(svNot)); + + return true; +} + +int main(int, char**) +{ + test(); + static_assert(test()); + + return 0; +} Index: libcxx/utils/generate_feature_test_macro_components.py =================================================================== --- libcxx/utils/generate_feature_test_macro_components.py +++ libcxx/utils/generate_feature_test_macro_components.py @@ -486,6 +486,12 @@ "values": { "c++20": int(201907) }, "headers": ["memory"] }, + # C++2b + { + "name": "__cpp_lib_string_contains", + "values": { "c++2b": int(202011) }, + "headers": ["string", "string_view"] + }, ]], key=lambda tc: tc["name"]) # Map from each header to the Lit annotations that should be used for @@ -506,7 +512,7 @@ } def get_std_dialects(): - std_dialects = ['c++14', 'c++17', 'c++20'] + std_dialects = ['c++14', 'c++17', 'c++20', 'c++2b'] return list(std_dialects) def get_first_std(d): @@ -659,6 +665,10 @@ {cxx20_macros} #endif +#if _LIBCPP_STD_VER > 20 +{cxx2b_macros} +#endif + #endif // _LIBCPP_VERSIONH """ @@ -666,7 +676,8 @@ synopsis=produce_version_synopsis().strip(), cxx14_macros=produce_macros_definition_for_std('c++14').strip(), cxx17_macros=produce_macros_definition_for_std('c++17').strip(), - cxx20_macros=produce_macros_definition_for_std('c++20').strip()) + cxx20_macros=produce_macros_definition_for_std('c++20').strip(), + cxx2b_macros=produce_macros_definition_for_std('c++2b').strip()) version_header_path = os.path.join(include_path, 'version') with open(version_header_path, 'w', newline='\n') as f: @@ -802,7 +813,11 @@ {cxx20_tests} -#endif // TEST_STD_VER == 20 +#elif TEST_STD_VER > 20 + +{cxx2b_tests} + +#endif // TEST_STD_VER > 20 int main(int, char**) {{ return 0; }} """.format(script_name=script_name, @@ -812,7 +827,8 @@ cxx11_tests=generate_std_test(test_list, 'c++11').strip(), cxx14_tests=generate_std_test(test_list, 'c++14').strip(), cxx17_tests=generate_std_test(test_list, 'c++17').strip(), - cxx20_tests=generate_std_test(test_list, 'c++20').strip()) + cxx20_tests=generate_std_test(test_list, 'c++20').strip(), + cxx2b_tests=generate_std_test(test_list, 'c++2b').strip()) test_name = "{header}.version.pass.cpp".format(header=h) out_path = os.path.join(macro_test_path, test_name) with open(out_path, 'w', newline='\n') as f: