diff --git a/libcxx/cmake/caches/Generic-cxx2a.cmake b/libcxx/cmake/caches/Generic-cxx20.cmake similarity index 100% rename from libcxx/cmake/caches/Generic-cxx2a.cmake rename to libcxx/cmake/caches/Generic-cxx20.cmake diff --git a/libcxx/docs/DesignDocs/FeatureTestMacros.rst b/libcxx/docs/DesignDocs/FeatureTestMacros.rst index 644eb4a6b41142..2c6f983ee6d016 100644 --- a/libcxx/docs/DesignDocs/FeatureTestMacros.rst +++ b/libcxx/docs/DesignDocs/FeatureTestMacros.rst @@ -8,7 +8,7 @@ Feature Test Macros Overview ======== -Libc++ implements the C++ feature test macros as specified in the C++2a standard, +Libc++ implements the C++ feature test macros as specified in the C++20 standard, and before that in non-normative guiding documents (`See cppreference `_) diff --git a/libcxx/docs/FeatureTestMacroTable.rst b/libcxx/docs/FeatureTestMacroTable.rst index 5930cdaffaec66..895e96f97d63e0 100644 --- a/libcxx/docs/FeatureTestMacroTable.rst +++ b/libcxx/docs/FeatureTestMacroTable.rst @@ -166,7 +166,7 @@ Status ------------------------------------------------- ----------------- ``__cpp_lib_void_t`` ``201411L`` ------------------------------------------------- ----------------- - **C++ 2a** + **C++ 20** ------------------------------------------------------------------- ``__cpp_lib_array_constexpr`` ``201811L`` ------------------------------------------------- ----------------- diff --git a/libcxx/docs/UsingLibcxx.rst b/libcxx/docs/UsingLibcxx.rst index 4c37ada334b6f0..6bf67ce22db598 100644 --- a/libcxx/docs/UsingLibcxx.rst +++ b/libcxx/docs/UsingLibcxx.rst @@ -254,7 +254,7 @@ C++17 Specific Configuration Macros **_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR**: This macro is used to re-enable `std::auto_ptr` in C++17. -C++2a Specific Configuration Macros: +C++20 Specific Configuration Macros: ------------------------------------ **_LIBCPP_DISABLE_NODISCARD_AFTER_CXX17**: This macro can be used to disable diagnostics emitted from functions marked diff --git a/libcxx/include/__config b/libcxx/include/__config index 9f49e805d61bf4..4537d249cf4f86 100644 --- a/libcxx/include/__config +++ b/libcxx/include/__config @@ -49,8 +49,10 @@ # define _LIBCPP_STD_VER 14 # elif __cplusplus <= 201703L # define _LIBCPP_STD_VER 17 +# elif __cplusplus <= 202002L +# define _LIBCPP_STD_VER 20 # else -# define _LIBCPP_STD_VER 18 // current year, or date of c++2a ratification +# define _LIBCPP_STD_VER 21 // current year, or date of c++2b ratification # endif #endif // _LIBCPP_STD_VER diff --git a/libcxx/include/new b/libcxx/include/new index 8b17003b7b87fe..0562cef4586878 100644 --- a/libcxx/include/new +++ b/libcxx/include/new @@ -49,11 +49,11 @@ new_handler get_new_handler() noexcept; template constexpr T* launder(T* p) noexcept; // C++17 } // std -void* operator new(std::size_t size); // replaceable, nodiscard in C++2a -void* operator new(std::size_t size, std::align_val_t alignment); // replaceable, C++17, nodiscard in C++2a -void* operator new(std::size_t size, const std::nothrow_t&) noexcept; // replaceable, nodiscard in C++2a +void* operator new(std::size_t size); // replaceable, nodiscard in C++20 +void* operator new(std::size_t size, std::align_val_t alignment); // replaceable, C++17, nodiscard in C++20 +void* operator new(std::size_t size, const std::nothrow_t&) noexcept; // replaceable, nodiscard in C++20 void* operator new(std::size_t size, std::align_val_t alignment, - const std::nothrow_t&) noexcept; // replaceable, C++17, nodiscard in C++2a + const std::nothrow_t&) noexcept; // replaceable, C++17, nodiscard in C++20 void operator delete(void* ptr) noexcept; // replaceable void operator delete(void* ptr, std::size_t size) noexcept; // replaceable, C++14 void operator delete(void* ptr, std::align_val_t alignment) noexcept; // replaceable, C++17 @@ -63,12 +63,12 @@ void operator delete(void* ptr, const std::nothrow_t&) noexcept; // repla void operator delete(void* ptr, std:align_val_t alignment, const std::nothrow_t&) noexcept; // replaceable, C++17 -void* operator new[](std::size_t size); // replaceable, nodiscard in C++2a +void* operator new[](std::size_t size); // replaceable, nodiscard in C++20 void* operator new[](std::size_t size, - std::align_val_t alignment) noexcept; // replaceable, C++17, nodiscard in C++2a -void* operator new[](std::size_t size, const std::nothrow_t&) noexcept; // replaceable, nodiscard in C++2a + std::align_val_t alignment) noexcept; // replaceable, C++17, nodiscard in C++20 +void* operator new[](std::size_t size, const std::nothrow_t&) noexcept; // replaceable, nodiscard in C++20 void* operator new[](std::size_t size, std::align_val_t alignment, - const std::nothrow_t&) noexcept; // replaceable, C++17, nodiscard in C++2a + const std::nothrow_t&) noexcept; // replaceable, C++17, nodiscard in C++20 void operator delete[](void* ptr) noexcept; // replaceable void operator delete[](void* ptr, std::size_t size) noexcept; // replaceable, C++14 void operator delete[](void* ptr, @@ -79,8 +79,8 @@ void operator delete[](void* ptr, const std::nothrow_t&) noexcept; // repla void operator delete[](void* ptr, std::align_val_t alignment, const std::nothrow_t&) noexcept; // replaceable, C++17 -void* operator new (std::size_t size, void* ptr) noexcept; // nodiscard in C++2a -void* operator new[](std::size_t size, void* ptr) noexcept; // nodiscard in C++2a +void* operator new (std::size_t size, void* ptr) noexcept; // nodiscard in C++20 +void* operator new[](std::size_t size, void* ptr) noexcept; // nodiscard in C++20 void operator delete (void* ptr, void*) noexcept; void operator delete[](void* ptr, void*) noexcept; diff --git a/libcxx/include/string b/libcxx/include/string index 6805791d89c28d..ef606665e22c86 100644 --- a/libcxx/include/string +++ b/libcxx/include/string @@ -317,12 +317,12 @@ public: int compare(size_type pos1, size_type n1, const value_type* s) const; int compare(size_type pos1, size_type n1, const value_type* s, size_type n2) const; - bool starts_with(basic_string_view sv) const noexcept; // C++2a - bool starts_with(charT c) const noexcept; // C++2a - bool starts_with(const charT* s) const; // C++2a - bool ends_with(basic_string_view sv) const noexcept; // C++2a - bool ends_with(charT c) const noexcept; // C++2a - bool ends_with(const charT* s) const; // C++2a + bool starts_with(basic_string_view sv) const noexcept; // C++20 + bool starts_with(charT c) const noexcept; // C++20 + bool starts_with(const charT* s) const; // C++20 + bool ends_with(basic_string_view sv) const noexcept; // C++20 + bool ends_with(charT c) const noexcept; // C++20 + bool ends_with(const charT* s) const; // C++20 bool __invariants() const; }; diff --git a/libcxx/include/string_view b/libcxx/include/string_view index 44ffb02c432de4..28bbd3690e2a5b 100644 --- a/libcxx/include/string_view +++ b/libcxx/include/string_view @@ -142,12 +142,12 @@ namespace std { constexpr size_type find_last_not_of(const charT* s, size_type pos, size_type n) const; constexpr size_type find_last_not_of(const charT* s, size_type pos = npos) const; - constexpr bool starts_with(basic_string_view s) const noexcept; // C++2a - constexpr bool starts_with(charT c) const noexcept; // C++2a - constexpr bool starts_with(const charT* s) const; // C++2a - constexpr bool ends_with(basic_string_view s) const noexcept; // C++2a - constexpr bool ends_with(charT c) const noexcept; // C++2a - constexpr bool ends_with(const charT* s) const; // C++2a + constexpr bool starts_with(basic_string_view s) const noexcept; // C++20 + constexpr bool starts_with(charT c) const noexcept; // C++20 + constexpr bool starts_with(const charT* s) const; // C++20 + constexpr bool ends_with(basic_string_view s) const noexcept; // C++20 + constexpr bool ends_with(charT c) const noexcept; // C++20 + constexpr bool ends_with(const charT* s) const; // C++20 private: const_pointer data_; // exposition only diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/algorithm.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/algorithm.version.pass.cpp index 5458e9194297db..820816dc2fd1de 100644 --- a/libcxx/test/std/language.support/support.limits/support.limits.general/algorithm.version.pass.cpp +++ b/libcxx/test/std/language.support/support.limits/support.limits.general/algorithm.version.pass.cpp @@ -15,9 +15,9 @@ /* Constant Value __cpp_lib_clamp 201603L [C++17] - __cpp_lib_constexpr_swap_algorithms 201806L [C++2a] + __cpp_lib_constexpr_swap_algorithms 201806L [C++20] __cpp_lib_parallel_algorithm 201603L [C++17] - __cpp_lib_ranges 201811L [C++2a] + __cpp_lib_ranges 201811L [C++20] __cpp_lib_robust_nonmodifying_seq_ops 201304L [C++14] __cpp_lib_sample 201603L [C++17] */ @@ -32,7 +32,7 @@ # endif # ifdef __cpp_lib_constexpr_swap_algorithms -# error "__cpp_lib_constexpr_swap_algorithms should not be defined before c++2a" +# error "__cpp_lib_constexpr_swap_algorithms should not be defined before c++20" # endif # ifdef __cpp_lib_parallel_algorithm @@ -40,7 +40,7 @@ # endif # ifdef __cpp_lib_ranges -# error "__cpp_lib_ranges should not be defined before c++2a" +# error "__cpp_lib_ranges should not be defined before c++20" # endif # ifdef __cpp_lib_robust_nonmodifying_seq_ops @@ -58,7 +58,7 @@ # endif # ifdef __cpp_lib_constexpr_swap_algorithms -# error "__cpp_lib_constexpr_swap_algorithms should not be defined before c++2a" +# error "__cpp_lib_constexpr_swap_algorithms should not be defined before c++20" # endif # ifdef __cpp_lib_parallel_algorithm @@ -66,7 +66,7 @@ # endif # ifdef __cpp_lib_ranges -# error "__cpp_lib_ranges should not be defined before c++2a" +# error "__cpp_lib_ranges should not be defined before c++20" # endif # ifndef __cpp_lib_robust_nonmodifying_seq_ops @@ -90,7 +90,7 @@ # endif # ifdef __cpp_lib_constexpr_swap_algorithms -# error "__cpp_lib_constexpr_swap_algorithms should not be defined before c++2a" +# error "__cpp_lib_constexpr_swap_algorithms should not be defined before c++20" # endif # if !defined(_LIBCPP_VERSION) @@ -107,7 +107,7 @@ # endif # ifdef __cpp_lib_ranges -# error "__cpp_lib_ranges should not be defined before c++2a" +# error "__cpp_lib_ranges should not be defined before c++20" # endif # ifndef __cpp_lib_robust_nonmodifying_seq_ops @@ -124,21 +124,21 @@ # error "__cpp_lib_sample should have the value 201603L in c++17" # endif -#elif TEST_STD_VER > 17 +#elif TEST_STD_VER == 20 # ifndef __cpp_lib_clamp -# error "__cpp_lib_clamp should be defined in c++2a" +# error "__cpp_lib_clamp should be defined in c++20" # endif # if __cpp_lib_clamp != 201603L -# error "__cpp_lib_clamp should have the value 201603L in c++2a" +# error "__cpp_lib_clamp should have the value 201603L in c++20" # endif # if !defined(_LIBCPP_VERSION) # ifndef __cpp_lib_constexpr_swap_algorithms -# error "__cpp_lib_constexpr_swap_algorithms should be defined in c++2a" +# error "__cpp_lib_constexpr_swap_algorithms should be defined in c++20" # endif # if __cpp_lib_constexpr_swap_algorithms != 201806L -# error "__cpp_lib_constexpr_swap_algorithms should have the value 201806L in c++2a" +# error "__cpp_lib_constexpr_swap_algorithms should have the value 201806L in c++20" # endif # else // _LIBCPP_VERSION # ifdef __cpp_lib_constexpr_swap_algorithms @@ -148,10 +148,10 @@ # if !defined(_LIBCPP_VERSION) # ifndef __cpp_lib_parallel_algorithm -# error "__cpp_lib_parallel_algorithm should be defined in c++2a" +# error "__cpp_lib_parallel_algorithm should be defined in c++20" # endif # if __cpp_lib_parallel_algorithm != 201603L -# error "__cpp_lib_parallel_algorithm should have the value 201603L in c++2a" +# error "__cpp_lib_parallel_algorithm should have the value 201603L in c++20" # endif # else // _LIBCPP_VERSION # ifdef __cpp_lib_parallel_algorithm @@ -161,10 +161,10 @@ # if !defined(_LIBCPP_VERSION) # ifndef __cpp_lib_ranges -# error "__cpp_lib_ranges should be defined in c++2a" +# error "__cpp_lib_ranges should be defined in c++20" # endif # if __cpp_lib_ranges != 201811L -# error "__cpp_lib_ranges should have the value 201811L in c++2a" +# error "__cpp_lib_ranges should have the value 201811L in c++20" # endif # else // _LIBCPP_VERSION # ifdef __cpp_lib_ranges @@ -173,19 +173,19 @@ # endif # ifndef __cpp_lib_robust_nonmodifying_seq_ops -# error "__cpp_lib_robust_nonmodifying_seq_ops should be defined in c++2a" +# error "__cpp_lib_robust_nonmodifying_seq_ops should be defined in c++20" # endif # if __cpp_lib_robust_nonmodifying_seq_ops != 201304L -# error "__cpp_lib_robust_nonmodifying_seq_ops should have the value 201304L in c++2a" +# error "__cpp_lib_robust_nonmodifying_seq_ops should have the value 201304L in c++20" # endif # ifndef __cpp_lib_sample -# error "__cpp_lib_sample should be defined in c++2a" +# error "__cpp_lib_sample should be defined in c++20" # endif # if __cpp_lib_sample != 201603L -# error "__cpp_lib_sample should have the value 201603L in c++2a" +# error "__cpp_lib_sample should have the value 201603L in c++20" # endif -#endif // TEST_STD_VER > 17 +#endif // TEST_STD_VER == 20 int main(int, char**) { return 0; } diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/any.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/any.version.pass.cpp index f5255c0e26a6db..e4f89d296ef8bc 100644 --- a/libcxx/test/std/language.support/support.limits/support.limits.general/any.version.pass.cpp +++ b/libcxx/test/std/language.support/support.limits/support.limits.general/any.version.pass.cpp @@ -41,15 +41,15 @@ # error "__cpp_lib_any should have the value 201606L in c++17" # endif -#elif TEST_STD_VER > 17 +#elif TEST_STD_VER == 20 # ifndef __cpp_lib_any -# error "__cpp_lib_any should be defined in c++2a" +# error "__cpp_lib_any should be defined in c++20" # endif # if __cpp_lib_any != 201606L -# error "__cpp_lib_any should have the value 201606L in c++2a" +# error "__cpp_lib_any should have the value 201606L in c++20" # endif -#endif // TEST_STD_VER > 17 +#endif // TEST_STD_VER == 20 int main(int, char**) { return 0; } diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/array.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/array.version.pass.cpp index c2e831a3af317d..494ba44c62f30c 100644 --- a/libcxx/test/std/language.support/support.limits/support.limits.general/array.version.pass.cpp +++ b/libcxx/test/std/language.support/support.limits/support.limits.general/array.version.pass.cpp @@ -15,9 +15,9 @@ /* Constant Value __cpp_lib_array_constexpr 201603L [C++17] - 201811L [C++2a] + 201811L [C++20] __cpp_lib_nonmember_container_access 201411L [C++17] - __cpp_lib_to_array 201907L [C++2a] + __cpp_lib_to_array 201907L [C++20] */ #include @@ -34,7 +34,7 @@ # endif # ifdef __cpp_lib_to_array -# error "__cpp_lib_to_array should not be defined before c++2a" +# error "__cpp_lib_to_array should not be defined before c++20" # endif #elif TEST_STD_VER == 14 @@ -48,7 +48,7 @@ # endif # ifdef __cpp_lib_to_array -# error "__cpp_lib_to_array should not be defined before c++2a" +# error "__cpp_lib_to_array should not be defined before c++20" # endif #elif TEST_STD_VER == 17 @@ -68,32 +68,32 @@ # endif # ifdef __cpp_lib_to_array -# error "__cpp_lib_to_array should not be defined before c++2a" +# error "__cpp_lib_to_array should not be defined before c++20" # endif -#elif TEST_STD_VER > 17 +#elif TEST_STD_VER == 20 # ifndef __cpp_lib_array_constexpr -# error "__cpp_lib_array_constexpr should be defined in c++2a" +# error "__cpp_lib_array_constexpr should be defined in c++20" # endif # if __cpp_lib_array_constexpr != 201811L -# error "__cpp_lib_array_constexpr should have the value 201811L in c++2a" +# error "__cpp_lib_array_constexpr should have the value 201811L in c++20" # endif # ifndef __cpp_lib_nonmember_container_access -# error "__cpp_lib_nonmember_container_access should be defined in c++2a" +# error "__cpp_lib_nonmember_container_access should be defined in c++20" # endif # if __cpp_lib_nonmember_container_access != 201411L -# error "__cpp_lib_nonmember_container_access should have the value 201411L in c++2a" +# error "__cpp_lib_nonmember_container_access should have the value 201411L in c++20" # endif # ifndef __cpp_lib_to_array -# error "__cpp_lib_to_array should be defined in c++2a" +# error "__cpp_lib_to_array should be defined in c++20" # endif # if __cpp_lib_to_array != 201907L -# error "__cpp_lib_to_array should have the value 201907L in c++2a" +# error "__cpp_lib_to_array should have the value 201907L in c++20" # endif -#endif // TEST_STD_VER > 17 +#endif // TEST_STD_VER == 20 int main(int, char**) { return 0; } diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/atomic.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/atomic.version.pass.cpp index d4c63edb5b8a36..3eeca0477652e0 100644 --- a/libcxx/test/std/language.support/support.limits/support.limits.general/atomic.version.pass.cpp +++ b/libcxx/test/std/language.support/support.limits/support.limits.general/atomic.version.pass.cpp @@ -16,15 +16,15 @@ // Test the feature test macros defined by /* Constant Value - __cpp_lib_atomic_flag_test 201907L [C++2a] - __cpp_lib_atomic_float 201711L [C++2a] + __cpp_lib_atomic_flag_test 201907L [C++20] + __cpp_lib_atomic_float 201711L [C++20] __cpp_lib_atomic_is_always_lock_free 201603L [C++17] - __cpp_lib_atomic_lock_free_type_aliases 201907L [C++2a] - __cpp_lib_atomic_ref 201806L [C++2a] - __cpp_lib_atomic_shared_ptr 201711L [C++2a] - __cpp_lib_atomic_value_initialization 201911L [C++2a] - __cpp_lib_atomic_wait 201907L [C++2a] - __cpp_lib_char8_t 201811L [C++2a] + __cpp_lib_atomic_lock_free_type_aliases 201907L [C++20] + __cpp_lib_atomic_ref 201806L [C++20] + __cpp_lib_atomic_shared_ptr 201711L [C++20] + __cpp_lib_atomic_value_initialization 201911L [C++20] + __cpp_lib_atomic_wait 201907L [C++20] + __cpp_lib_char8_t 201811L [C++20] */ #include @@ -33,11 +33,11 @@ #if TEST_STD_VER < 14 # ifdef __cpp_lib_atomic_flag_test -# error "__cpp_lib_atomic_flag_test should not be defined before c++2a" +# error "__cpp_lib_atomic_flag_test should not be defined before c++20" # endif # ifdef __cpp_lib_atomic_float -# error "__cpp_lib_atomic_float should not be defined before c++2a" +# error "__cpp_lib_atomic_float should not be defined before c++20" # endif # ifdef __cpp_lib_atomic_is_always_lock_free @@ -45,37 +45,37 @@ # endif # ifdef __cpp_lib_atomic_lock_free_type_aliases -# error "__cpp_lib_atomic_lock_free_type_aliases should not be defined before c++2a" +# error "__cpp_lib_atomic_lock_free_type_aliases should not be defined before c++20" # endif # ifdef __cpp_lib_atomic_ref -# error "__cpp_lib_atomic_ref should not be defined before c++2a" +# error "__cpp_lib_atomic_ref should not be defined before c++20" # endif # ifdef __cpp_lib_atomic_shared_ptr -# error "__cpp_lib_atomic_shared_ptr should not be defined before c++2a" +# error "__cpp_lib_atomic_shared_ptr should not be defined before c++20" # endif # ifdef __cpp_lib_atomic_value_initialization -# error "__cpp_lib_atomic_value_initialization should not be defined before c++2a" +# error "__cpp_lib_atomic_value_initialization should not be defined before c++20" # endif # ifdef __cpp_lib_atomic_wait -# error "__cpp_lib_atomic_wait should not be defined before c++2a" +# error "__cpp_lib_atomic_wait should not be defined before c++20" # endif # ifdef __cpp_lib_char8_t -# error "__cpp_lib_char8_t should not be defined before c++2a" +# error "__cpp_lib_char8_t should not be defined before c++20" # endif #elif TEST_STD_VER == 14 # ifdef __cpp_lib_atomic_flag_test -# error "__cpp_lib_atomic_flag_test should not be defined before c++2a" +# error "__cpp_lib_atomic_flag_test should not be defined before c++20" # endif # ifdef __cpp_lib_atomic_float -# error "__cpp_lib_atomic_float should not be defined before c++2a" +# error "__cpp_lib_atomic_float should not be defined before c++20" # endif # ifdef __cpp_lib_atomic_is_always_lock_free @@ -83,37 +83,37 @@ # endif # ifdef __cpp_lib_atomic_lock_free_type_aliases -# error "__cpp_lib_atomic_lock_free_type_aliases should not be defined before c++2a" +# error "__cpp_lib_atomic_lock_free_type_aliases should not be defined before c++20" # endif # ifdef __cpp_lib_atomic_ref -# error "__cpp_lib_atomic_ref should not be defined before c++2a" +# error "__cpp_lib_atomic_ref should not be defined before c++20" # endif # ifdef __cpp_lib_atomic_shared_ptr -# error "__cpp_lib_atomic_shared_ptr should not be defined before c++2a" +# error "__cpp_lib_atomic_shared_ptr should not be defined before c++20" # endif # ifdef __cpp_lib_atomic_value_initialization -# error "__cpp_lib_atomic_value_initialization should not be defined before c++2a" +# error "__cpp_lib_atomic_value_initialization should not be defined before c++20" # endif # ifdef __cpp_lib_atomic_wait -# error "__cpp_lib_atomic_wait should not be defined before c++2a" +# error "__cpp_lib_atomic_wait should not be defined before c++20" # endif # ifdef __cpp_lib_char8_t -# error "__cpp_lib_char8_t should not be defined before c++2a" +# error "__cpp_lib_char8_t should not be defined before c++20" # endif #elif TEST_STD_VER == 17 # ifdef __cpp_lib_atomic_flag_test -# error "__cpp_lib_atomic_flag_test should not be defined before c++2a" +# error "__cpp_lib_atomic_flag_test should not be defined before c++20" # endif # ifdef __cpp_lib_atomic_float -# error "__cpp_lib_atomic_float should not be defined before c++2a" +# error "__cpp_lib_atomic_float should not be defined before c++20" # endif # if !defined(_LIBCPP_HAS_NO_THREADS) @@ -130,37 +130,37 @@ # endif # ifdef __cpp_lib_atomic_lock_free_type_aliases -# error "__cpp_lib_atomic_lock_free_type_aliases should not be defined before c++2a" +# error "__cpp_lib_atomic_lock_free_type_aliases should not be defined before c++20" # endif # ifdef __cpp_lib_atomic_ref -# error "__cpp_lib_atomic_ref should not be defined before c++2a" +# error "__cpp_lib_atomic_ref should not be defined before c++20" # endif # ifdef __cpp_lib_atomic_shared_ptr -# error "__cpp_lib_atomic_shared_ptr should not be defined before c++2a" +# error "__cpp_lib_atomic_shared_ptr should not be defined before c++20" # endif # ifdef __cpp_lib_atomic_value_initialization -# error "__cpp_lib_atomic_value_initialization should not be defined before c++2a" +# error "__cpp_lib_atomic_value_initialization should not be defined before c++20" # endif # ifdef __cpp_lib_atomic_wait -# error "__cpp_lib_atomic_wait should not be defined before c++2a" +# error "__cpp_lib_atomic_wait should not be defined before c++20" # endif # ifdef __cpp_lib_char8_t -# error "__cpp_lib_char8_t should not be defined before c++2a" +# error "__cpp_lib_char8_t should not be defined before c++20" # endif -#elif TEST_STD_VER > 17 +#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++2a" +# error "__cpp_lib_atomic_flag_test should be defined in c++20" # endif # if __cpp_lib_atomic_flag_test != 201907L -# error "__cpp_lib_atomic_flag_test should have the value 201907L in c++2a" +# error "__cpp_lib_atomic_flag_test should have the value 201907L in c++20" # endif # else # ifdef __cpp_lib_atomic_flag_test @@ -170,10 +170,10 @@ # if !defined(_LIBCPP_VERSION) # ifndef __cpp_lib_atomic_float -# error "__cpp_lib_atomic_float should be defined in c++2a" +# error "__cpp_lib_atomic_float should be defined in c++20" # endif # if __cpp_lib_atomic_float != 201711L -# error "__cpp_lib_atomic_float should have the value 201711L in c++2a" +# error "__cpp_lib_atomic_float should have the value 201711L in c++20" # endif # else // _LIBCPP_VERSION # ifdef __cpp_lib_atomic_float @@ -183,10 +183,10 @@ # 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++2a" +# error "__cpp_lib_atomic_is_always_lock_free should be defined in c++20" # 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++2a" +# error "__cpp_lib_atomic_is_always_lock_free should have the value 201603L in c++20" # endif # else # ifdef __cpp_lib_atomic_is_always_lock_free @@ -196,10 +196,10 @@ # 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++2a" +# error "__cpp_lib_atomic_lock_free_type_aliases should be defined in c++20" # 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++2a" +# error "__cpp_lib_atomic_lock_free_type_aliases should have the value 201907L in c++20" # endif # else # ifdef __cpp_lib_atomic_lock_free_type_aliases @@ -209,10 +209,10 @@ # if !defined(_LIBCPP_VERSION) # ifndef __cpp_lib_atomic_ref -# error "__cpp_lib_atomic_ref should be defined in c++2a" +# error "__cpp_lib_atomic_ref should be defined in c++20" # endif # if __cpp_lib_atomic_ref != 201806L -# error "__cpp_lib_atomic_ref should have the value 201806L in c++2a" +# error "__cpp_lib_atomic_ref should have the value 201806L in c++20" # endif # else // _LIBCPP_VERSION # ifdef __cpp_lib_atomic_ref @@ -222,10 +222,10 @@ # if !defined(_LIBCPP_VERSION) # ifndef __cpp_lib_atomic_shared_ptr -# error "__cpp_lib_atomic_shared_ptr should be defined in c++2a" +# error "__cpp_lib_atomic_shared_ptr should be defined in c++20" # endif # if __cpp_lib_atomic_shared_ptr != 201711L -# error "__cpp_lib_atomic_shared_ptr should have the value 201711L in c++2a" +# error "__cpp_lib_atomic_shared_ptr should have the value 201711L in c++20" # endif # else // _LIBCPP_VERSION # ifdef __cpp_lib_atomic_shared_ptr @@ -235,10 +235,10 @@ # if !defined(_LIBCPP_VERSION) # ifndef __cpp_lib_atomic_value_initialization -# error "__cpp_lib_atomic_value_initialization should be defined in c++2a" +# error "__cpp_lib_atomic_value_initialization should be defined in c++20" # endif # if __cpp_lib_atomic_value_initialization != 201911L -# error "__cpp_lib_atomic_value_initialization should have the value 201911L in c++2a" +# error "__cpp_lib_atomic_value_initialization should have the value 201911L in c++20" # endif # else // _LIBCPP_VERSION # ifdef __cpp_lib_atomic_value_initialization @@ -248,10 +248,10 @@ # if !defined(_LIBCPP_HAS_NO_THREADS) # ifndef __cpp_lib_atomic_wait -# error "__cpp_lib_atomic_wait should be defined in c++2a" +# error "__cpp_lib_atomic_wait should be defined in c++20" # endif # if __cpp_lib_atomic_wait != 201907L -# error "__cpp_lib_atomic_wait should have the value 201907L in c++2a" +# error "__cpp_lib_atomic_wait should have the value 201907L in c++20" # endif # else # ifdef __cpp_lib_atomic_wait @@ -261,10 +261,10 @@ # if defined(__cpp_char8_t) # ifndef __cpp_lib_char8_t -# error "__cpp_lib_char8_t should be defined in c++2a" +# error "__cpp_lib_char8_t should be defined in c++20" # endif # if __cpp_lib_char8_t != 201811L -# error "__cpp_lib_char8_t should have the value 201811L in c++2a" +# error "__cpp_lib_char8_t should have the value 201811L in c++20" # endif # else # ifdef __cpp_lib_char8_t @@ -272,6 +272,6 @@ # endif # endif -#endif // TEST_STD_VER > 17 +#endif // TEST_STD_VER == 20 int main(int, char**) { return 0; } diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/bit.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/bit.version.pass.cpp index 92a8ada73febd0..be015e444eb5c2 100644 --- a/libcxx/test/std/language.support/support.limits/support.limits.general/bit.version.pass.cpp +++ b/libcxx/test/std/language.support/support.limits/support.limits.general/bit.version.pass.cpp @@ -14,9 +14,9 @@ // Test the feature test macros defined by /* Constant Value - __cpp_lib_bit_cast 201806L [C++2a] - __cpp_lib_endian 201907L [C++2a] - __cpp_lib_int_pow2 202002L [C++2a] + __cpp_lib_bit_cast 201806L [C++20] + __cpp_lib_endian 201907L [C++20] + __cpp_lib_int_pow2 202002L [C++20] */ #include @@ -25,53 +25,53 @@ #if TEST_STD_VER < 14 # ifdef __cpp_lib_bit_cast -# error "__cpp_lib_bit_cast should not be defined before c++2a" +# error "__cpp_lib_bit_cast should not be defined before c++20" # endif # ifdef __cpp_lib_endian -# error "__cpp_lib_endian should not be defined before c++2a" +# error "__cpp_lib_endian should not be defined before c++20" # endif # ifdef __cpp_lib_int_pow2 -# error "__cpp_lib_int_pow2 should not be defined before c++2a" +# error "__cpp_lib_int_pow2 should not be defined before c++20" # endif #elif TEST_STD_VER == 14 # ifdef __cpp_lib_bit_cast -# error "__cpp_lib_bit_cast should not be defined before c++2a" +# error "__cpp_lib_bit_cast should not be defined before c++20" # endif # ifdef __cpp_lib_endian -# error "__cpp_lib_endian should not be defined before c++2a" +# error "__cpp_lib_endian should not be defined before c++20" # endif # ifdef __cpp_lib_int_pow2 -# error "__cpp_lib_int_pow2 should not be defined before c++2a" +# error "__cpp_lib_int_pow2 should not be defined before c++20" # endif #elif TEST_STD_VER == 17 # ifdef __cpp_lib_bit_cast -# error "__cpp_lib_bit_cast should not be defined before c++2a" +# error "__cpp_lib_bit_cast should not be defined before c++20" # endif # ifdef __cpp_lib_endian -# error "__cpp_lib_endian should not be defined before c++2a" +# error "__cpp_lib_endian should not be defined before c++20" # endif # ifdef __cpp_lib_int_pow2 -# error "__cpp_lib_int_pow2 should not be defined before c++2a" +# error "__cpp_lib_int_pow2 should not be defined before c++20" # endif -#elif TEST_STD_VER > 17 +#elif TEST_STD_VER == 20 # if !defined(_LIBCPP_VERSION) # ifndef __cpp_lib_bit_cast -# error "__cpp_lib_bit_cast should be defined in c++2a" +# error "__cpp_lib_bit_cast should be defined in c++20" # endif # if __cpp_lib_bit_cast != 201806L -# error "__cpp_lib_bit_cast should have the value 201806L in c++2a" +# error "__cpp_lib_bit_cast should have the value 201806L in c++20" # endif # else // _LIBCPP_VERSION # ifdef __cpp_lib_bit_cast @@ -80,19 +80,19 @@ # endif # ifndef __cpp_lib_endian -# error "__cpp_lib_endian should be defined in c++2a" +# error "__cpp_lib_endian should be defined in c++20" # endif # if __cpp_lib_endian != 201907L -# error "__cpp_lib_endian should have the value 201907L in c++2a" +# error "__cpp_lib_endian should have the value 201907L in c++20" # endif # ifndef __cpp_lib_int_pow2 -# error "__cpp_lib_int_pow2 should be defined in c++2a" +# error "__cpp_lib_int_pow2 should be defined in c++20" # endif # if __cpp_lib_int_pow2 != 202002L -# error "__cpp_lib_int_pow2 should have the value 202002L in c++2a" +# error "__cpp_lib_int_pow2 should have the value 202002L in c++20" # endif -#endif // TEST_STD_VER > 17 +#endif // TEST_STD_VER == 20 int main(int, char**) { return 0; } diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/chrono.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/chrono.version.pass.cpp index 88da2dcca6d786..b27cc4f1bf99df 100644 --- a/libcxx/test/std/language.support/support.limits/support.limits.general/chrono.version.pass.cpp +++ b/libcxx/test/std/language.support/support.limits/support.limits.general/chrono.version.pass.cpp @@ -60,22 +60,22 @@ # error "__cpp_lib_chrono_udls should have the value 201304L in c++17" # endif -#elif TEST_STD_VER > 17 +#elif TEST_STD_VER == 20 # ifndef __cpp_lib_chrono -# error "__cpp_lib_chrono should be defined in c++2a" +# error "__cpp_lib_chrono should be defined in c++20" # endif # if __cpp_lib_chrono != 201611L -# error "__cpp_lib_chrono should have the value 201611L in c++2a" +# error "__cpp_lib_chrono should have the value 201611L in c++20" # endif # ifndef __cpp_lib_chrono_udls -# error "__cpp_lib_chrono_udls should be defined in c++2a" +# error "__cpp_lib_chrono_udls should be defined in c++20" # endif # if __cpp_lib_chrono_udls != 201304L -# error "__cpp_lib_chrono_udls should have the value 201304L in c++2a" +# error "__cpp_lib_chrono_udls should have the value 201304L in c++20" # endif -#endif // TEST_STD_VER > 17 +#endif // TEST_STD_VER == 20 int main(int, char**) { return 0; } diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/cmath.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/cmath.version.pass.cpp index d81218e66ab9f6..974c4cd76d2e11 100644 --- a/libcxx/test/std/language.support/support.limits/support.limits.general/cmath.version.pass.cpp +++ b/libcxx/test/std/language.support/support.limits/support.limits.general/cmath.version.pass.cpp @@ -63,21 +63,21 @@ # endif # endif -#elif TEST_STD_VER > 17 +#elif TEST_STD_VER == 20 # ifndef __cpp_lib_hypot -# error "__cpp_lib_hypot should be defined in c++2a" +# error "__cpp_lib_hypot should be defined in c++20" # endif # if __cpp_lib_hypot != 201603L -# error "__cpp_lib_hypot should have the value 201603L in c++2a" +# error "__cpp_lib_hypot should have the value 201603L in c++20" # endif # if !defined(_LIBCPP_VERSION) # ifndef __cpp_lib_math_special_functions -# error "__cpp_lib_math_special_functions should be defined in c++2a" +# error "__cpp_lib_math_special_functions should be defined in c++20" # endif # if __cpp_lib_math_special_functions != 201603L -# error "__cpp_lib_math_special_functions should have the value 201603L in c++2a" +# error "__cpp_lib_math_special_functions should have the value 201603L in c++20" # endif # else // _LIBCPP_VERSION # ifdef __cpp_lib_math_special_functions @@ -85,6 +85,6 @@ # endif # endif -#endif // TEST_STD_VER > 17 +#endif // TEST_STD_VER == 20 int main(int, char**) { return 0; } diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/compare.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/compare.version.pass.cpp index 7f1836fba00e67..bcf419dbb903b9 100644 --- a/libcxx/test/std/language.support/support.limits/support.limits.general/compare.version.pass.cpp +++ b/libcxx/test/std/language.support/support.limits/support.limits.general/compare.version.pass.cpp @@ -14,7 +14,7 @@ // Test the feature test macros defined by /* Constant Value - __cpp_lib_three_way_comparison 201711L [C++2a] + __cpp_lib_three_way_comparison 201711L [C++20] */ #include @@ -23,29 +23,29 @@ #if TEST_STD_VER < 14 # ifdef __cpp_lib_three_way_comparison -# error "__cpp_lib_three_way_comparison should not be defined before c++2a" +# error "__cpp_lib_three_way_comparison should not be defined before c++20" # endif #elif TEST_STD_VER == 14 # ifdef __cpp_lib_three_way_comparison -# error "__cpp_lib_three_way_comparison should not be defined before c++2a" +# error "__cpp_lib_three_way_comparison should not be defined before c++20" # endif #elif TEST_STD_VER == 17 # ifdef __cpp_lib_three_way_comparison -# error "__cpp_lib_three_way_comparison should not be defined before c++2a" +# error "__cpp_lib_three_way_comparison should not be defined before c++20" # endif -#elif TEST_STD_VER > 17 +#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++2a" +# error "__cpp_lib_three_way_comparison should be defined in c++20" # endif # if __cpp_lib_three_way_comparison != 201711L -# error "__cpp_lib_three_way_comparison should have the value 201711L in c++2a" +# error "__cpp_lib_three_way_comparison should have the value 201711L in c++20" # endif # else // _LIBCPP_VERSION # ifdef __cpp_lib_three_way_comparison @@ -53,6 +53,6 @@ # endif # endif -#endif // TEST_STD_VER > 17 +#endif // TEST_STD_VER == 20 int main(int, char**) { return 0; } diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/complex.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/complex.version.pass.cpp index bcff0bbe1856bc..9c39619ff68e87 100644 --- a/libcxx/test/std/language.support/support.limits/support.limits.general/complex.version.pass.cpp +++ b/libcxx/test/std/language.support/support.limits/support.limits.general/complex.version.pass.cpp @@ -44,15 +44,15 @@ # error "__cpp_lib_complex_udls should have the value 201309L in c++17" # endif -#elif TEST_STD_VER > 17 +#elif TEST_STD_VER == 20 # ifndef __cpp_lib_complex_udls -# error "__cpp_lib_complex_udls should be defined in c++2a" +# error "__cpp_lib_complex_udls should be defined in c++20" # endif # if __cpp_lib_complex_udls != 201309L -# error "__cpp_lib_complex_udls should have the value 201309L in c++2a" +# error "__cpp_lib_complex_udls should have the value 201309L in c++20" # endif -#endif // TEST_STD_VER > 17 +#endif // TEST_STD_VER == 20 int main(int, char**) { return 0; } diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/concepts.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/concepts.version.pass.cpp index 9ec2157d974ce4..a35da2dbb993f4 100644 --- a/libcxx/test/std/language.support/support.limits/support.limits.general/concepts.version.pass.cpp +++ b/libcxx/test/std/language.support/support.limits/support.limits.general/concepts.version.pass.cpp @@ -14,7 +14,7 @@ // Test the feature test macros defined by /* Constant Value - __cpp_lib_concepts 201806L [C++2a] + __cpp_lib_concepts 201806L [C++20] */ #include @@ -23,29 +23,29 @@ #if TEST_STD_VER < 14 # ifdef __cpp_lib_concepts -# error "__cpp_lib_concepts should not be defined before c++2a" +# error "__cpp_lib_concepts should not be defined before c++20" # endif #elif TEST_STD_VER == 14 # ifdef __cpp_lib_concepts -# error "__cpp_lib_concepts should not be defined before c++2a" +# error "__cpp_lib_concepts should not be defined before c++20" # endif #elif TEST_STD_VER == 17 # ifdef __cpp_lib_concepts -# error "__cpp_lib_concepts should not be defined before c++2a" +# error "__cpp_lib_concepts should not be defined before c++20" # endif -#elif TEST_STD_VER > 17 +#elif TEST_STD_VER == 20 # if !defined(_LIBCPP_VERSION) # ifndef __cpp_lib_concepts -# error "__cpp_lib_concepts should be defined in c++2a" +# error "__cpp_lib_concepts should be defined in c++20" # endif # if __cpp_lib_concepts != 201806L -# error "__cpp_lib_concepts should have the value 201806L in c++2a" +# error "__cpp_lib_concepts should have the value 201806L in c++20" # endif # else // _LIBCPP_VERSION # ifdef __cpp_lib_concepts @@ -53,6 +53,6 @@ # endif # endif -#endif // TEST_STD_VER > 17 +#endif // TEST_STD_VER == 20 int main(int, char**) { return 0; } diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/cstddef.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/cstddef.version.pass.cpp index b18ea07ea0cc60..b124150a3bafce 100644 --- a/libcxx/test/std/language.support/support.limits/support.limits.general/cstddef.version.pass.cpp +++ b/libcxx/test/std/language.support/support.limits/support.limits.general/cstddef.version.pass.cpp @@ -41,15 +41,15 @@ # error "__cpp_lib_byte should have the value 201603L in c++17" # endif -#elif TEST_STD_VER > 17 +#elif TEST_STD_VER == 20 # ifndef __cpp_lib_byte -# error "__cpp_lib_byte should be defined in c++2a" +# error "__cpp_lib_byte should be defined in c++20" # endif # if __cpp_lib_byte != 201603L -# error "__cpp_lib_byte should have the value 201603L in c++2a" +# error "__cpp_lib_byte should have the value 201603L in c++20" # endif -#endif // TEST_STD_VER > 17 +#endif // TEST_STD_VER == 20 int main(int, char**) { return 0; } diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/deque.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/deque.version.pass.cpp index ac6f94ff70f9b3..267ecf79c12784 100644 --- a/libcxx/test/std/language.support/support.limits/support.limits.general/deque.version.pass.cpp +++ b/libcxx/test/std/language.support/support.limits/support.limits.general/deque.version.pass.cpp @@ -15,7 +15,7 @@ /* Constant Value __cpp_lib_allocator_traits_is_always_equal 201411L [C++17] - __cpp_lib_erase_if 202002L [C++2a] + __cpp_lib_erase_if 202002L [C++20] __cpp_lib_nonmember_container_access 201411L [C++17] */ @@ -29,7 +29,7 @@ # endif # ifdef __cpp_lib_erase_if -# error "__cpp_lib_erase_if should not be defined before c++2a" +# error "__cpp_lib_erase_if should not be defined before c++20" # endif # ifdef __cpp_lib_nonmember_container_access @@ -43,7 +43,7 @@ # endif # ifdef __cpp_lib_erase_if -# error "__cpp_lib_erase_if should not be defined before c++2a" +# error "__cpp_lib_erase_if should not be defined before c++20" # endif # ifdef __cpp_lib_nonmember_container_access @@ -60,7 +60,7 @@ # endif # ifdef __cpp_lib_erase_if -# error "__cpp_lib_erase_if should not be defined before c++2a" +# error "__cpp_lib_erase_if should not be defined before c++20" # endif # ifndef __cpp_lib_nonmember_container_access @@ -70,29 +70,29 @@ # error "__cpp_lib_nonmember_container_access should have the value 201411L in c++17" # endif -#elif TEST_STD_VER > 17 +#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++2a" +# error "__cpp_lib_allocator_traits_is_always_equal should be defined in c++20" # 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++2a" +# error "__cpp_lib_allocator_traits_is_always_equal should have the value 201411L in c++20" # endif # ifndef __cpp_lib_erase_if -# error "__cpp_lib_erase_if should be defined in c++2a" +# error "__cpp_lib_erase_if should be defined in c++20" # endif # if __cpp_lib_erase_if != 202002L -# error "__cpp_lib_erase_if should have the value 202002L in c++2a" +# error "__cpp_lib_erase_if should have the value 202002L in c++20" # endif # ifndef __cpp_lib_nonmember_container_access -# error "__cpp_lib_nonmember_container_access should be defined in c++2a" +# error "__cpp_lib_nonmember_container_access should be defined in c++20" # endif # if __cpp_lib_nonmember_container_access != 201411L -# error "__cpp_lib_nonmember_container_access should have the value 201411L in c++2a" +# error "__cpp_lib_nonmember_container_access should have the value 201411L in c++20" # endif -#endif // TEST_STD_VER > 17 +#endif // TEST_STD_VER == 20 int main(int, char**) { return 0; } diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/exception.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/exception.version.pass.cpp index 1ecebb48f0f544..5bc32aa5c0f4e0 100644 --- a/libcxx/test/std/language.support/support.limits/support.limits.general/exception.version.pass.cpp +++ b/libcxx/test/std/language.support/support.limits/support.limits.general/exception.version.pass.cpp @@ -41,15 +41,15 @@ # error "__cpp_lib_uncaught_exceptions should have the value 201411L in c++17" # endif -#elif TEST_STD_VER > 17 +#elif TEST_STD_VER == 20 # ifndef __cpp_lib_uncaught_exceptions -# error "__cpp_lib_uncaught_exceptions should be defined in c++2a" +# error "__cpp_lib_uncaught_exceptions should be defined in c++20" # endif # if __cpp_lib_uncaught_exceptions != 201411L -# error "__cpp_lib_uncaught_exceptions should have the value 201411L in c++2a" +# error "__cpp_lib_uncaught_exceptions should have the value 201411L in c++20" # endif -#endif // TEST_STD_VER > 17 +#endif // TEST_STD_VER == 20 int main(int, char**) { return 0; } diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/execution.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/execution.version.pass.cpp index 1244efa4aebaf0..40e47ce9fc241f 100644 --- a/libcxx/test/std/language.support/support.limits/support.limits.general/execution.version.pass.cpp +++ b/libcxx/test/std/language.support/support.limits/support.limits.general/execution.version.pass.cpp @@ -47,14 +47,14 @@ # endif # endif -#elif TEST_STD_VER > 17 +#elif TEST_STD_VER == 20 # if !defined(_LIBCPP_VERSION) # ifndef __cpp_lib_execution -# error "__cpp_lib_execution should be defined in c++2a" +# error "__cpp_lib_execution should be defined in c++20" # endif # if __cpp_lib_execution != 201603L -# error "__cpp_lib_execution should have the value 201603L in c++2a" +# error "__cpp_lib_execution should have the value 201603L in c++20" # endif # else // _LIBCPP_VERSION # ifdef __cpp_lib_execution @@ -62,6 +62,6 @@ # endif # endif -#endif // TEST_STD_VER > 17 +#endif // TEST_STD_VER == 20 int main(int, char**) { return 0; } diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/filesystem.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/filesystem.version.pass.cpp index d1c09fc7ee4857..e3e5f6f7a218d1 100644 --- a/libcxx/test/std/language.support/support.limits/support.limits.general/filesystem.version.pass.cpp +++ b/libcxx/test/std/language.support/support.limits/support.limits.general/filesystem.version.pass.cpp @@ -14,7 +14,7 @@ // Test the feature test macros defined by /* Constant Value - __cpp_lib_char8_t 201811L [C++2a] + __cpp_lib_char8_t 201811L [C++20] __cpp_lib_filesystem 201703L [C++17] */ @@ -24,7 +24,7 @@ #if TEST_STD_VER < 14 # ifdef __cpp_lib_char8_t -# error "__cpp_lib_char8_t should not be defined before c++2a" +# error "__cpp_lib_char8_t should not be defined before c++20" # endif # ifdef __cpp_lib_filesystem @@ -34,7 +34,7 @@ #elif TEST_STD_VER == 14 # ifdef __cpp_lib_char8_t -# error "__cpp_lib_char8_t should not be defined before c++2a" +# error "__cpp_lib_char8_t should not be defined before c++20" # endif # ifdef __cpp_lib_filesystem @@ -44,7 +44,7 @@ #elif TEST_STD_VER == 17 # ifdef __cpp_lib_char8_t -# error "__cpp_lib_char8_t should not be defined before c++2a" +# error "__cpp_lib_char8_t should not be defined before c++20" # endif # ifndef __cpp_lib_filesystem @@ -54,14 +54,14 @@ # error "__cpp_lib_filesystem should have the value 201703L in c++17" # endif -#elif TEST_STD_VER > 17 +#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++2a" +# error "__cpp_lib_char8_t should be defined in c++20" # endif # if __cpp_lib_char8_t != 201811L -# error "__cpp_lib_char8_t should have the value 201811L in c++2a" +# error "__cpp_lib_char8_t should have the value 201811L in c++20" # endif # else # ifdef __cpp_lib_char8_t @@ -70,12 +70,12 @@ # endif # ifndef __cpp_lib_filesystem -# error "__cpp_lib_filesystem should be defined in c++2a" +# error "__cpp_lib_filesystem should be defined in c++20" # endif # if __cpp_lib_filesystem != 201703L -# error "__cpp_lib_filesystem should have the value 201703L in c++2a" +# error "__cpp_lib_filesystem should have the value 201703L in c++20" # endif -#endif // TEST_STD_VER > 17 +#endif // TEST_STD_VER == 20 int main(int, char**) { return 0; } diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/forward_list.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/forward_list.version.pass.cpp index 837abe395404ed..c57682e3b21b28 100644 --- a/libcxx/test/std/language.support/support.limits/support.limits.general/forward_list.version.pass.cpp +++ b/libcxx/test/std/language.support/support.limits/support.limits.general/forward_list.version.pass.cpp @@ -15,9 +15,9 @@ /* Constant Value __cpp_lib_allocator_traits_is_always_equal 201411L [C++17] - __cpp_lib_erase_if 202002L [C++2a] + __cpp_lib_erase_if 202002L [C++20] __cpp_lib_incomplete_container_elements 201505L [C++17] - __cpp_lib_list_remove_return_type 201806L [C++2a] + __cpp_lib_list_remove_return_type 201806L [C++20] __cpp_lib_nonmember_container_access 201411L [C++17] */ @@ -31,7 +31,7 @@ # endif # ifdef __cpp_lib_erase_if -# error "__cpp_lib_erase_if should not be defined before c++2a" +# error "__cpp_lib_erase_if should not be defined before c++20" # endif # ifdef __cpp_lib_incomplete_container_elements @@ -39,7 +39,7 @@ # endif # ifdef __cpp_lib_list_remove_return_type -# error "__cpp_lib_list_remove_return_type should not be defined before c++2a" +# error "__cpp_lib_list_remove_return_type should not be defined before c++20" # endif # ifdef __cpp_lib_nonmember_container_access @@ -53,7 +53,7 @@ # endif # ifdef __cpp_lib_erase_if -# error "__cpp_lib_erase_if should not be defined before c++2a" +# error "__cpp_lib_erase_if should not be defined before c++20" # endif # ifdef __cpp_lib_incomplete_container_elements @@ -61,7 +61,7 @@ # endif # ifdef __cpp_lib_list_remove_return_type -# error "__cpp_lib_list_remove_return_type should not be defined before c++2a" +# error "__cpp_lib_list_remove_return_type should not be defined before c++20" # endif # ifdef __cpp_lib_nonmember_container_access @@ -78,7 +78,7 @@ # endif # ifdef __cpp_lib_erase_if -# error "__cpp_lib_erase_if should not be defined before c++2a" +# error "__cpp_lib_erase_if should not be defined before c++20" # endif # ifndef __cpp_lib_incomplete_container_elements @@ -89,7 +89,7 @@ # endif # ifdef __cpp_lib_list_remove_return_type -# error "__cpp_lib_list_remove_return_type should not be defined before c++2a" +# error "__cpp_lib_list_remove_return_type should not be defined before c++20" # endif # ifndef __cpp_lib_nonmember_container_access @@ -99,43 +99,43 @@ # error "__cpp_lib_nonmember_container_access should have the value 201411L in c++17" # endif -#elif TEST_STD_VER > 17 +#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++2a" +# error "__cpp_lib_allocator_traits_is_always_equal should be defined in c++20" # 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++2a" +# error "__cpp_lib_allocator_traits_is_always_equal should have the value 201411L in c++20" # endif # ifndef __cpp_lib_erase_if -# error "__cpp_lib_erase_if should be defined in c++2a" +# error "__cpp_lib_erase_if should be defined in c++20" # endif # if __cpp_lib_erase_if != 202002L -# error "__cpp_lib_erase_if should have the value 202002L in c++2a" +# error "__cpp_lib_erase_if should have the value 202002L in c++20" # endif # ifndef __cpp_lib_incomplete_container_elements -# error "__cpp_lib_incomplete_container_elements should be defined in c++2a" +# error "__cpp_lib_incomplete_container_elements should be defined in c++20" # endif # if __cpp_lib_incomplete_container_elements != 201505L -# error "__cpp_lib_incomplete_container_elements should have the value 201505L in c++2a" +# error "__cpp_lib_incomplete_container_elements should have the value 201505L in c++20" # endif # ifndef __cpp_lib_list_remove_return_type -# error "__cpp_lib_list_remove_return_type should be defined in c++2a" +# error "__cpp_lib_list_remove_return_type should be defined in c++20" # endif # if __cpp_lib_list_remove_return_type != 201806L -# error "__cpp_lib_list_remove_return_type should have the value 201806L in c++2a" +# error "__cpp_lib_list_remove_return_type should have the value 201806L in c++20" # endif # ifndef __cpp_lib_nonmember_container_access -# error "__cpp_lib_nonmember_container_access should be defined in c++2a" +# error "__cpp_lib_nonmember_container_access should be defined in c++20" # endif # if __cpp_lib_nonmember_container_access != 201411L -# error "__cpp_lib_nonmember_container_access should have the value 201411L in c++2a" +# error "__cpp_lib_nonmember_container_access should have the value 201411L in c++20" # endif -#endif // TEST_STD_VER > 17 +#endif // TEST_STD_VER == 20 int main(int, char**) { return 0; } diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/functional.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/functional.version.pass.cpp index 2b556010f00e1e..6fa7b858011060 100644 --- a/libcxx/test/std/language.support/support.limits/support.limits.general/functional.version.pass.cpp +++ b/libcxx/test/std/language.support/support.limits/support.limits.general/functional.version.pass.cpp @@ -14,12 +14,12 @@ // Test the feature test macros defined by /* Constant Value - __cpp_lib_bind_front 201811L [C++2a] + __cpp_lib_bind_front 201811L [C++20] __cpp_lib_boyer_moore_searcher 201603L [C++17] - __cpp_lib_constexpr_functional 201907L [C++2a] + __cpp_lib_constexpr_functional 201907L [C++20] __cpp_lib_invoke 201411L [C++17] __cpp_lib_not_fn 201603L [C++17] - __cpp_lib_ranges 201811L [C++2a] + __cpp_lib_ranges 201811L [C++20] __cpp_lib_result_of_sfinae 201210L [C++14] __cpp_lib_transparent_operators 201210L [C++14] 201510L [C++17] @@ -31,7 +31,7 @@ #if TEST_STD_VER < 14 # ifdef __cpp_lib_bind_front -# error "__cpp_lib_bind_front should not be defined before c++2a" +# error "__cpp_lib_bind_front should not be defined before c++20" # endif # ifdef __cpp_lib_boyer_moore_searcher @@ -39,7 +39,7 @@ # endif # ifdef __cpp_lib_constexpr_functional -# error "__cpp_lib_constexpr_functional should not be defined before c++2a" +# error "__cpp_lib_constexpr_functional should not be defined before c++20" # endif # ifdef __cpp_lib_invoke @@ -51,7 +51,7 @@ # endif # ifdef __cpp_lib_ranges -# error "__cpp_lib_ranges should not be defined before c++2a" +# error "__cpp_lib_ranges should not be defined before c++20" # endif # ifdef __cpp_lib_result_of_sfinae @@ -65,7 +65,7 @@ #elif TEST_STD_VER == 14 # ifdef __cpp_lib_bind_front -# error "__cpp_lib_bind_front should not be defined before c++2a" +# error "__cpp_lib_bind_front should not be defined before c++20" # endif # ifdef __cpp_lib_boyer_moore_searcher @@ -73,7 +73,7 @@ # endif # ifdef __cpp_lib_constexpr_functional -# error "__cpp_lib_constexpr_functional should not be defined before c++2a" +# error "__cpp_lib_constexpr_functional should not be defined before c++20" # endif # ifdef __cpp_lib_invoke @@ -85,7 +85,7 @@ # endif # ifdef __cpp_lib_ranges -# error "__cpp_lib_ranges should not be defined before c++2a" +# error "__cpp_lib_ranges should not be defined before c++20" # endif # ifndef __cpp_lib_result_of_sfinae @@ -105,7 +105,7 @@ #elif TEST_STD_VER == 17 # ifdef __cpp_lib_bind_front -# error "__cpp_lib_bind_front should not be defined before c++2a" +# error "__cpp_lib_bind_front should not be defined before c++20" # endif # if !defined(_LIBCPP_VERSION) @@ -122,7 +122,7 @@ # endif # ifdef __cpp_lib_constexpr_functional -# error "__cpp_lib_constexpr_functional should not be defined before c++2a" +# error "__cpp_lib_constexpr_functional should not be defined before c++20" # endif # ifndef __cpp_lib_invoke @@ -140,7 +140,7 @@ # endif # ifdef __cpp_lib_ranges -# error "__cpp_lib_ranges should not be defined before c++2a" +# error "__cpp_lib_ranges should not be defined before c++20" # endif # ifndef __cpp_lib_result_of_sfinae @@ -157,14 +157,14 @@ # error "__cpp_lib_transparent_operators should have the value 201510L in c++17" # endif -#elif TEST_STD_VER > 17 +#elif TEST_STD_VER == 20 # if !defined(_LIBCPP_VERSION) # ifndef __cpp_lib_bind_front -# error "__cpp_lib_bind_front should be defined in c++2a" +# error "__cpp_lib_bind_front should be defined in c++20" # endif # if __cpp_lib_bind_front != 201811L -# error "__cpp_lib_bind_front should have the value 201811L in c++2a" +# error "__cpp_lib_bind_front should have the value 201811L in c++20" # endif # else // _LIBCPP_VERSION # ifdef __cpp_lib_bind_front @@ -174,10 +174,10 @@ # if !defined(_LIBCPP_VERSION) # ifndef __cpp_lib_boyer_moore_searcher -# error "__cpp_lib_boyer_moore_searcher should be defined in c++2a" +# error "__cpp_lib_boyer_moore_searcher should be defined in c++20" # endif # if __cpp_lib_boyer_moore_searcher != 201603L -# error "__cpp_lib_boyer_moore_searcher should have the value 201603L in c++2a" +# error "__cpp_lib_boyer_moore_searcher should have the value 201603L in c++20" # endif # else // _LIBCPP_VERSION # ifdef __cpp_lib_boyer_moore_searcher @@ -186,32 +186,32 @@ # endif # ifndef __cpp_lib_constexpr_functional -# error "__cpp_lib_constexpr_functional should be defined in c++2a" +# error "__cpp_lib_constexpr_functional should be defined in c++20" # endif # if __cpp_lib_constexpr_functional != 201907L -# error "__cpp_lib_constexpr_functional should have the value 201907L in c++2a" +# error "__cpp_lib_constexpr_functional should have the value 201907L in c++20" # endif # ifndef __cpp_lib_invoke -# error "__cpp_lib_invoke should be defined in c++2a" +# error "__cpp_lib_invoke should be defined in c++20" # endif # if __cpp_lib_invoke != 201411L -# error "__cpp_lib_invoke should have the value 201411L in c++2a" +# error "__cpp_lib_invoke should have the value 201411L in c++20" # endif # ifndef __cpp_lib_not_fn -# error "__cpp_lib_not_fn should be defined in c++2a" +# error "__cpp_lib_not_fn should be defined in c++20" # endif # if __cpp_lib_not_fn != 201603L -# error "__cpp_lib_not_fn should have the value 201603L in c++2a" +# error "__cpp_lib_not_fn should have the value 201603L in c++20" # endif # if !defined(_LIBCPP_VERSION) # ifndef __cpp_lib_ranges -# error "__cpp_lib_ranges should be defined in c++2a" +# error "__cpp_lib_ranges should be defined in c++20" # endif # if __cpp_lib_ranges != 201811L -# error "__cpp_lib_ranges should have the value 201811L in c++2a" +# error "__cpp_lib_ranges should have the value 201811L in c++20" # endif # else // _LIBCPP_VERSION # ifdef __cpp_lib_ranges @@ -220,19 +220,19 @@ # endif # ifndef __cpp_lib_result_of_sfinae -# error "__cpp_lib_result_of_sfinae should be defined in c++2a" +# error "__cpp_lib_result_of_sfinae should be defined in c++20" # endif # if __cpp_lib_result_of_sfinae != 201210L -# error "__cpp_lib_result_of_sfinae should have the value 201210L in c++2a" +# error "__cpp_lib_result_of_sfinae should have the value 201210L in c++20" # endif # ifndef __cpp_lib_transparent_operators -# error "__cpp_lib_transparent_operators should be defined in c++2a" +# error "__cpp_lib_transparent_operators should be defined in c++20" # endif # if __cpp_lib_transparent_operators != 201510L -# error "__cpp_lib_transparent_operators should have the value 201510L in c++2a" +# error "__cpp_lib_transparent_operators should have the value 201510L in c++20" # endif -#endif // TEST_STD_VER > 17 +#endif // TEST_STD_VER == 20 int main(int, char**) { return 0; } diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/iomanip.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/iomanip.version.pass.cpp index 0b1b4ea3e1063b..36612e02082681 100644 --- a/libcxx/test/std/language.support/support.limits/support.limits.general/iomanip.version.pass.cpp +++ b/libcxx/test/std/language.support/support.limits/support.limits.general/iomanip.version.pass.cpp @@ -46,15 +46,15 @@ # error "__cpp_lib_quoted_string_io should have the value 201304L in c++17" # endif -#elif TEST_STD_VER > 17 +#elif TEST_STD_VER == 20 # ifndef __cpp_lib_quoted_string_io -# error "__cpp_lib_quoted_string_io should be defined in c++2a" +# error "__cpp_lib_quoted_string_io should be defined in c++20" # endif # if __cpp_lib_quoted_string_io != 201304L -# error "__cpp_lib_quoted_string_io should have the value 201304L in c++2a" +# error "__cpp_lib_quoted_string_io should have the value 201304L in c++20" # endif -#endif // TEST_STD_VER > 17 +#endif // TEST_STD_VER == 20 int main(int, char**) { return 0; } diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/istream.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/istream.version.pass.cpp index 967173ea61a191..761712b70f8be6 100644 --- a/libcxx/test/std/language.support/support.limits/support.limits.general/istream.version.pass.cpp +++ b/libcxx/test/std/language.support/support.limits/support.limits.general/istream.version.pass.cpp @@ -16,7 +16,7 @@ // Test the feature test macros defined by /* Constant Value - __cpp_lib_char8_t 201811L [C++2a] + __cpp_lib_char8_t 201811L [C++20] */ #include @@ -25,29 +25,29 @@ #if TEST_STD_VER < 14 # ifdef __cpp_lib_char8_t -# error "__cpp_lib_char8_t should not be defined before c++2a" +# error "__cpp_lib_char8_t should not be defined before c++20" # endif #elif TEST_STD_VER == 14 # ifdef __cpp_lib_char8_t -# error "__cpp_lib_char8_t should not be defined before c++2a" +# error "__cpp_lib_char8_t should not be defined before c++20" # endif #elif TEST_STD_VER == 17 # ifdef __cpp_lib_char8_t -# error "__cpp_lib_char8_t should not be defined before c++2a" +# error "__cpp_lib_char8_t should not be defined before c++20" # endif -#elif TEST_STD_VER > 17 +#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++2a" +# error "__cpp_lib_char8_t should be defined in c++20" # endif # if __cpp_lib_char8_t != 201811L -# error "__cpp_lib_char8_t should have the value 201811L in c++2a" +# error "__cpp_lib_char8_t should have the value 201811L in c++20" # endif # else # ifdef __cpp_lib_char8_t @@ -55,6 +55,6 @@ # endif # endif -#endif // TEST_STD_VER > 17 +#endif // TEST_STD_VER == 20 int main(int, char**) { return 0; } diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/iterator.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/iterator.version.pass.cpp index 0c128f5a46dee5..c6e5851d0755f8 100644 --- a/libcxx/test/std/language.support/support.limits/support.limits.general/iterator.version.pass.cpp +++ b/libcxx/test/std/language.support/support.limits/support.limits.general/iterator.version.pass.cpp @@ -15,11 +15,11 @@ /* Constant Value __cpp_lib_array_constexpr 201603L [C++17] - 201811L [C++2a] + 201811L [C++20] __cpp_lib_make_reverse_iterator 201402L [C++14] __cpp_lib_nonmember_container_access 201411L [C++17] __cpp_lib_null_iterators 201304L [C++14] - __cpp_lib_ranges 201811L [C++2a] + __cpp_lib_ranges 201811L [C++20] */ #include @@ -44,7 +44,7 @@ # endif # ifdef __cpp_lib_ranges -# error "__cpp_lib_ranges should not be defined before c++2a" +# error "__cpp_lib_ranges should not be defined before c++20" # endif #elif TEST_STD_VER == 14 @@ -72,7 +72,7 @@ # endif # ifdef __cpp_lib_ranges -# error "__cpp_lib_ranges should not be defined before c++2a" +# error "__cpp_lib_ranges should not be defined before c++20" # endif #elif TEST_STD_VER == 17 @@ -106,45 +106,45 @@ # endif # ifdef __cpp_lib_ranges -# error "__cpp_lib_ranges should not be defined before c++2a" +# error "__cpp_lib_ranges should not be defined before c++20" # endif -#elif TEST_STD_VER > 17 +#elif TEST_STD_VER == 20 # ifndef __cpp_lib_array_constexpr -# error "__cpp_lib_array_constexpr should be defined in c++2a" +# error "__cpp_lib_array_constexpr should be defined in c++20" # endif # if __cpp_lib_array_constexpr != 201811L -# error "__cpp_lib_array_constexpr should have the value 201811L in c++2a" +# error "__cpp_lib_array_constexpr should have the value 201811L in c++20" # endif # ifndef __cpp_lib_make_reverse_iterator -# error "__cpp_lib_make_reverse_iterator should be defined in c++2a" +# error "__cpp_lib_make_reverse_iterator should be defined in c++20" # endif # if __cpp_lib_make_reverse_iterator != 201402L -# error "__cpp_lib_make_reverse_iterator should have the value 201402L in c++2a" +# error "__cpp_lib_make_reverse_iterator should have the value 201402L in c++20" # endif # ifndef __cpp_lib_nonmember_container_access -# error "__cpp_lib_nonmember_container_access should be defined in c++2a" +# error "__cpp_lib_nonmember_container_access should be defined in c++20" # endif # if __cpp_lib_nonmember_container_access != 201411L -# error "__cpp_lib_nonmember_container_access should have the value 201411L in c++2a" +# error "__cpp_lib_nonmember_container_access should have the value 201411L in c++20" # endif # ifndef __cpp_lib_null_iterators -# error "__cpp_lib_null_iterators should be defined in c++2a" +# error "__cpp_lib_null_iterators should be defined in c++20" # endif # if __cpp_lib_null_iterators != 201304L -# error "__cpp_lib_null_iterators should have the value 201304L in c++2a" +# error "__cpp_lib_null_iterators should have the value 201304L in c++20" # endif # if !defined(_LIBCPP_VERSION) # ifndef __cpp_lib_ranges -# error "__cpp_lib_ranges should be defined in c++2a" +# error "__cpp_lib_ranges should be defined in c++20" # endif # if __cpp_lib_ranges != 201811L -# error "__cpp_lib_ranges should have the value 201811L in c++2a" +# error "__cpp_lib_ranges should have the value 201811L in c++20" # endif # else // _LIBCPP_VERSION # ifdef __cpp_lib_ranges @@ -152,6 +152,6 @@ # endif # endif -#endif // TEST_STD_VER > 17 +#endif // TEST_STD_VER == 20 int main(int, char**) { return 0; } diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/limits.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/limits.version.pass.cpp index 2d2f243e70411c..daf8869c002103 100644 --- a/libcxx/test/std/language.support/support.limits/support.limits.general/limits.version.pass.cpp +++ b/libcxx/test/std/language.support/support.limits/support.limits.general/limits.version.pass.cpp @@ -14,7 +14,7 @@ // Test the feature test macros defined by /* Constant Value - __cpp_lib_char8_t 201811L [C++2a] + __cpp_lib_char8_t 201811L [C++20] */ #include @@ -23,29 +23,29 @@ #if TEST_STD_VER < 14 # ifdef __cpp_lib_char8_t -# error "__cpp_lib_char8_t should not be defined before c++2a" +# error "__cpp_lib_char8_t should not be defined before c++20" # endif #elif TEST_STD_VER == 14 # ifdef __cpp_lib_char8_t -# error "__cpp_lib_char8_t should not be defined before c++2a" +# error "__cpp_lib_char8_t should not be defined before c++20" # endif #elif TEST_STD_VER == 17 # ifdef __cpp_lib_char8_t -# error "__cpp_lib_char8_t should not be defined before c++2a" +# error "__cpp_lib_char8_t should not be defined before c++20" # endif -#elif TEST_STD_VER > 17 +#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++2a" +# error "__cpp_lib_char8_t should be defined in c++20" # endif # if __cpp_lib_char8_t != 201811L -# error "__cpp_lib_char8_t should have the value 201811L in c++2a" +# error "__cpp_lib_char8_t should have the value 201811L in c++20" # endif # else # ifdef __cpp_lib_char8_t @@ -53,6 +53,6 @@ # endif # endif -#endif // TEST_STD_VER > 17 +#endif // TEST_STD_VER == 20 int main(int, char**) { return 0; } diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/list.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/list.version.pass.cpp index 218510fb65eff6..92552a752c1963 100644 --- a/libcxx/test/std/language.support/support.limits/support.limits.general/list.version.pass.cpp +++ b/libcxx/test/std/language.support/support.limits/support.limits.general/list.version.pass.cpp @@ -15,9 +15,9 @@ /* Constant Value __cpp_lib_allocator_traits_is_always_equal 201411L [C++17] - __cpp_lib_erase_if 202002L [C++2a] + __cpp_lib_erase_if 202002L [C++20] __cpp_lib_incomplete_container_elements 201505L [C++17] - __cpp_lib_list_remove_return_type 201806L [C++2a] + __cpp_lib_list_remove_return_type 201806L [C++20] __cpp_lib_nonmember_container_access 201411L [C++17] */ @@ -31,7 +31,7 @@ # endif # ifdef __cpp_lib_erase_if -# error "__cpp_lib_erase_if should not be defined before c++2a" +# error "__cpp_lib_erase_if should not be defined before c++20" # endif # ifdef __cpp_lib_incomplete_container_elements @@ -39,7 +39,7 @@ # endif # ifdef __cpp_lib_list_remove_return_type -# error "__cpp_lib_list_remove_return_type should not be defined before c++2a" +# error "__cpp_lib_list_remove_return_type should not be defined before c++20" # endif # ifdef __cpp_lib_nonmember_container_access @@ -53,7 +53,7 @@ # endif # ifdef __cpp_lib_erase_if -# error "__cpp_lib_erase_if should not be defined before c++2a" +# error "__cpp_lib_erase_if should not be defined before c++20" # endif # ifdef __cpp_lib_incomplete_container_elements @@ -61,7 +61,7 @@ # endif # ifdef __cpp_lib_list_remove_return_type -# error "__cpp_lib_list_remove_return_type should not be defined before c++2a" +# error "__cpp_lib_list_remove_return_type should not be defined before c++20" # endif # ifdef __cpp_lib_nonmember_container_access @@ -78,7 +78,7 @@ # endif # ifdef __cpp_lib_erase_if -# error "__cpp_lib_erase_if should not be defined before c++2a" +# error "__cpp_lib_erase_if should not be defined before c++20" # endif # ifndef __cpp_lib_incomplete_container_elements @@ -89,7 +89,7 @@ # endif # ifdef __cpp_lib_list_remove_return_type -# error "__cpp_lib_list_remove_return_type should not be defined before c++2a" +# error "__cpp_lib_list_remove_return_type should not be defined before c++20" # endif # ifndef __cpp_lib_nonmember_container_access @@ -99,43 +99,43 @@ # error "__cpp_lib_nonmember_container_access should have the value 201411L in c++17" # endif -#elif TEST_STD_VER > 17 +#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++2a" +# error "__cpp_lib_allocator_traits_is_always_equal should be defined in c++20" # 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++2a" +# error "__cpp_lib_allocator_traits_is_always_equal should have the value 201411L in c++20" # endif # ifndef __cpp_lib_erase_if -# error "__cpp_lib_erase_if should be defined in c++2a" +# error "__cpp_lib_erase_if should be defined in c++20" # endif # if __cpp_lib_erase_if != 202002L -# error "__cpp_lib_erase_if should have the value 202002L in c++2a" +# error "__cpp_lib_erase_if should have the value 202002L in c++20" # endif # ifndef __cpp_lib_incomplete_container_elements -# error "__cpp_lib_incomplete_container_elements should be defined in c++2a" +# error "__cpp_lib_incomplete_container_elements should be defined in c++20" # endif # if __cpp_lib_incomplete_container_elements != 201505L -# error "__cpp_lib_incomplete_container_elements should have the value 201505L in c++2a" +# error "__cpp_lib_incomplete_container_elements should have the value 201505L in c++20" # endif # ifndef __cpp_lib_list_remove_return_type -# error "__cpp_lib_list_remove_return_type should be defined in c++2a" +# error "__cpp_lib_list_remove_return_type should be defined in c++20" # endif # if __cpp_lib_list_remove_return_type != 201806L -# error "__cpp_lib_list_remove_return_type should have the value 201806L in c++2a" +# error "__cpp_lib_list_remove_return_type should have the value 201806L in c++20" # endif # ifndef __cpp_lib_nonmember_container_access -# error "__cpp_lib_nonmember_container_access should be defined in c++2a" +# error "__cpp_lib_nonmember_container_access should be defined in c++20" # endif # if __cpp_lib_nonmember_container_access != 201411L -# error "__cpp_lib_nonmember_container_access should have the value 201411L in c++2a" +# error "__cpp_lib_nonmember_container_access should have the value 201411L in c++20" # endif -#endif // TEST_STD_VER > 17 +#endif // TEST_STD_VER == 20 int main(int, char**) { return 0; } diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/locale.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/locale.version.pass.cpp index 43156342555f3f..9744c7e4511b8a 100644 --- a/libcxx/test/std/language.support/support.limits/support.limits.general/locale.version.pass.cpp +++ b/libcxx/test/std/language.support/support.limits/support.limits.general/locale.version.pass.cpp @@ -16,7 +16,7 @@ // Test the feature test macros defined by /* Constant Value - __cpp_lib_char8_t 201811L [C++2a] + __cpp_lib_char8_t 201811L [C++20] */ #include @@ -25,29 +25,29 @@ #if TEST_STD_VER < 14 # ifdef __cpp_lib_char8_t -# error "__cpp_lib_char8_t should not be defined before c++2a" +# error "__cpp_lib_char8_t should not be defined before c++20" # endif #elif TEST_STD_VER == 14 # ifdef __cpp_lib_char8_t -# error "__cpp_lib_char8_t should not be defined before c++2a" +# error "__cpp_lib_char8_t should not be defined before c++20" # endif #elif TEST_STD_VER == 17 # ifdef __cpp_lib_char8_t -# error "__cpp_lib_char8_t should not be defined before c++2a" +# error "__cpp_lib_char8_t should not be defined before c++20" # endif -#elif TEST_STD_VER > 17 +#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++2a" +# error "__cpp_lib_char8_t should be defined in c++20" # endif # if __cpp_lib_char8_t != 201811L -# error "__cpp_lib_char8_t should have the value 201811L in c++2a" +# error "__cpp_lib_char8_t should have the value 201811L in c++20" # endif # else # ifdef __cpp_lib_char8_t @@ -55,6 +55,6 @@ # endif # endif -#endif // TEST_STD_VER > 17 +#endif // TEST_STD_VER == 20 int main(int, char**) { return 0; } diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/map.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/map.version.pass.cpp index c6ef179249b104..58aa741ba6de28 100644 --- a/libcxx/test/std/language.support/support.limits/support.limits.general/map.version.pass.cpp +++ b/libcxx/test/std/language.support/support.limits/support.limits.general/map.version.pass.cpp @@ -15,7 +15,7 @@ /* Constant Value __cpp_lib_allocator_traits_is_always_equal 201411L [C++17] - __cpp_lib_erase_if 202002L [C++2a] + __cpp_lib_erase_if 202002L [C++20] __cpp_lib_generic_associative_lookup 201304L [C++14] __cpp_lib_map_try_emplace 201411L [C++17] __cpp_lib_node_extract 201606L [C++17] @@ -32,7 +32,7 @@ # endif # ifdef __cpp_lib_erase_if -# error "__cpp_lib_erase_if should not be defined before c++2a" +# error "__cpp_lib_erase_if should not be defined before c++20" # endif # ifdef __cpp_lib_generic_associative_lookup @@ -58,7 +58,7 @@ # endif # ifdef __cpp_lib_erase_if -# error "__cpp_lib_erase_if should not be defined before c++2a" +# error "__cpp_lib_erase_if should not be defined before c++20" # endif # ifndef __cpp_lib_generic_associative_lookup @@ -90,7 +90,7 @@ # endif # ifdef __cpp_lib_erase_if -# error "__cpp_lib_erase_if should not be defined before c++2a" +# error "__cpp_lib_erase_if should not be defined before c++20" # endif # ifndef __cpp_lib_generic_associative_lookup @@ -121,50 +121,50 @@ # error "__cpp_lib_nonmember_container_access should have the value 201411L in c++17" # endif -#elif TEST_STD_VER > 17 +#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++2a" +# error "__cpp_lib_allocator_traits_is_always_equal should be defined in c++20" # 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++2a" +# error "__cpp_lib_allocator_traits_is_always_equal should have the value 201411L in c++20" # endif # ifndef __cpp_lib_erase_if -# error "__cpp_lib_erase_if should be defined in c++2a" +# error "__cpp_lib_erase_if should be defined in c++20" # endif # if __cpp_lib_erase_if != 202002L -# error "__cpp_lib_erase_if should have the value 202002L in c++2a" +# error "__cpp_lib_erase_if should have the value 202002L in c++20" # endif # ifndef __cpp_lib_generic_associative_lookup -# error "__cpp_lib_generic_associative_lookup should be defined in c++2a" +# error "__cpp_lib_generic_associative_lookup should be defined in c++20" # endif # if __cpp_lib_generic_associative_lookup != 201304L -# error "__cpp_lib_generic_associative_lookup should have the value 201304L in c++2a" +# error "__cpp_lib_generic_associative_lookup should have the value 201304L in c++20" # endif # ifndef __cpp_lib_map_try_emplace -# error "__cpp_lib_map_try_emplace should be defined in c++2a" +# error "__cpp_lib_map_try_emplace should be defined in c++20" # endif # if __cpp_lib_map_try_emplace != 201411L -# error "__cpp_lib_map_try_emplace should have the value 201411L in c++2a" +# error "__cpp_lib_map_try_emplace should have the value 201411L in c++20" # endif # ifndef __cpp_lib_node_extract -# error "__cpp_lib_node_extract should be defined in c++2a" +# error "__cpp_lib_node_extract should be defined in c++20" # endif # if __cpp_lib_node_extract != 201606L -# error "__cpp_lib_node_extract should have the value 201606L in c++2a" +# error "__cpp_lib_node_extract should have the value 201606L in c++20" # endif # ifndef __cpp_lib_nonmember_container_access -# error "__cpp_lib_nonmember_container_access should be defined in c++2a" +# error "__cpp_lib_nonmember_container_access should be defined in c++20" # endif # if __cpp_lib_nonmember_container_access != 201411L -# error "__cpp_lib_nonmember_container_access should have the value 201411L in c++2a" +# error "__cpp_lib_nonmember_container_access should have the value 201411L in c++20" # endif -#endif // TEST_STD_VER > 17 +#endif // TEST_STD_VER == 20 int main(int, char**) { return 0; } diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/memory.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/memory.version.pass.cpp index 4a2b778a32bd72..3fe3990bb75f2a 100644 --- a/libcxx/test/std/language.support/support.limits/support.limits.general/memory.version.pass.cpp +++ b/libcxx/test/std/language.support/support.limits/support.limits.general/memory.version.pass.cpp @@ -16,11 +16,11 @@ /* Constant Value __cpp_lib_addressof_constexpr 201603L [C++17] __cpp_lib_allocator_traits_is_always_equal 201411L [C++17] - __cpp_lib_atomic_value_initialization 201911L [C++2a] - __cpp_lib_constexpr_dynamic_alloc 201907L [C++2a] + __cpp_lib_atomic_value_initialization 201911L [C++20] + __cpp_lib_constexpr_dynamic_alloc 201907L [C++20] __cpp_lib_enable_shared_from_this 201603L [C++17] __cpp_lib_make_unique 201304L [C++14] - __cpp_lib_ranges 201811L [C++2a] + __cpp_lib_ranges 201811L [C++20] __cpp_lib_raw_memory_algorithms 201606L [C++17] __cpp_lib_shared_ptr_arrays 201611L [C++17] __cpp_lib_shared_ptr_weak_type 201606L [C++17] @@ -40,11 +40,11 @@ # endif # ifdef __cpp_lib_atomic_value_initialization -# error "__cpp_lib_atomic_value_initialization should not be defined before c++2a" +# error "__cpp_lib_atomic_value_initialization should not be defined before c++20" # endif # ifdef __cpp_lib_constexpr_dynamic_alloc -# error "__cpp_lib_constexpr_dynamic_alloc should not be defined before c++2a" +# error "__cpp_lib_constexpr_dynamic_alloc should not be defined before c++20" # endif # ifdef __cpp_lib_enable_shared_from_this @@ -56,7 +56,7 @@ # endif # ifdef __cpp_lib_ranges -# error "__cpp_lib_ranges should not be defined before c++2a" +# error "__cpp_lib_ranges should not be defined before c++20" # endif # ifdef __cpp_lib_raw_memory_algorithms @@ -82,11 +82,11 @@ # endif # ifdef __cpp_lib_atomic_value_initialization -# error "__cpp_lib_atomic_value_initialization should not be defined before c++2a" +# error "__cpp_lib_atomic_value_initialization should not be defined before c++20" # endif # ifdef __cpp_lib_constexpr_dynamic_alloc -# error "__cpp_lib_constexpr_dynamic_alloc should not be defined before c++2a" +# error "__cpp_lib_constexpr_dynamic_alloc should not be defined before c++20" # endif # ifdef __cpp_lib_enable_shared_from_this @@ -101,7 +101,7 @@ # endif # ifdef __cpp_lib_ranges -# error "__cpp_lib_ranges should not be defined before c++2a" +# error "__cpp_lib_ranges should not be defined before c++20" # endif # ifdef __cpp_lib_raw_memory_algorithms @@ -139,11 +139,11 @@ # endif # ifdef __cpp_lib_atomic_value_initialization -# error "__cpp_lib_atomic_value_initialization should not be defined before c++2a" +# error "__cpp_lib_atomic_value_initialization should not be defined before c++20" # endif # ifdef __cpp_lib_constexpr_dynamic_alloc -# error "__cpp_lib_constexpr_dynamic_alloc should not be defined before c++2a" +# error "__cpp_lib_constexpr_dynamic_alloc should not be defined before c++20" # endif # ifndef __cpp_lib_enable_shared_from_this @@ -161,7 +161,7 @@ # endif # ifdef __cpp_lib_ranges -# error "__cpp_lib_ranges should not be defined before c++2a" +# error "__cpp_lib_ranges should not be defined before c++20" # endif # ifndef __cpp_lib_raw_memory_algorithms @@ -185,14 +185,14 @@ # error "__cpp_lib_shared_ptr_weak_type should have the value 201606L in c++17" # endif -#elif TEST_STD_VER > 17 +#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++2a" +# error "__cpp_lib_addressof_constexpr should be defined in c++20" # endif # if __cpp_lib_addressof_constexpr != 201603L -# error "__cpp_lib_addressof_constexpr should have the value 201603L in c++2a" +# error "__cpp_lib_addressof_constexpr should have the value 201603L in c++20" # endif # else # ifdef __cpp_lib_addressof_constexpr @@ -201,18 +201,18 @@ # endif # ifndef __cpp_lib_allocator_traits_is_always_equal -# error "__cpp_lib_allocator_traits_is_always_equal should be defined in c++2a" +# error "__cpp_lib_allocator_traits_is_always_equal should be defined in c++20" # 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++2a" +# error "__cpp_lib_allocator_traits_is_always_equal should have the value 201411L in c++20" # endif # if !defined(_LIBCPP_VERSION) # ifndef __cpp_lib_atomic_value_initialization -# error "__cpp_lib_atomic_value_initialization should be defined in c++2a" +# error "__cpp_lib_atomic_value_initialization should be defined in c++20" # endif # if __cpp_lib_atomic_value_initialization != 201911L -# error "__cpp_lib_atomic_value_initialization should have the value 201911L in c++2a" +# error "__cpp_lib_atomic_value_initialization should have the value 201911L in c++20" # endif # else // _LIBCPP_VERSION # ifdef __cpp_lib_atomic_value_initialization @@ -221,32 +221,32 @@ # endif # ifndef __cpp_lib_constexpr_dynamic_alloc -# error "__cpp_lib_constexpr_dynamic_alloc should be defined in c++2a" +# error "__cpp_lib_constexpr_dynamic_alloc should be defined in c++20" # endif # if __cpp_lib_constexpr_dynamic_alloc != 201907L -# error "__cpp_lib_constexpr_dynamic_alloc should have the value 201907L in c++2a" +# error "__cpp_lib_constexpr_dynamic_alloc should have the value 201907L in c++20" # endif # ifndef __cpp_lib_enable_shared_from_this -# error "__cpp_lib_enable_shared_from_this should be defined in c++2a" +# error "__cpp_lib_enable_shared_from_this should be defined in c++20" # endif # if __cpp_lib_enable_shared_from_this != 201603L -# error "__cpp_lib_enable_shared_from_this should have the value 201603L in c++2a" +# error "__cpp_lib_enable_shared_from_this should have the value 201603L in c++20" # endif # ifndef __cpp_lib_make_unique -# error "__cpp_lib_make_unique should be defined in c++2a" +# error "__cpp_lib_make_unique should be defined in c++20" # endif # if __cpp_lib_make_unique != 201304L -# error "__cpp_lib_make_unique should have the value 201304L in c++2a" +# error "__cpp_lib_make_unique should have the value 201304L in c++20" # endif # if !defined(_LIBCPP_VERSION) # ifndef __cpp_lib_ranges -# error "__cpp_lib_ranges should be defined in c++2a" +# error "__cpp_lib_ranges should be defined in c++20" # endif # if __cpp_lib_ranges != 201811L -# error "__cpp_lib_ranges should have the value 201811L in c++2a" +# error "__cpp_lib_ranges should have the value 201811L in c++20" # endif # else // _LIBCPP_VERSION # ifdef __cpp_lib_ranges @@ -255,26 +255,26 @@ # endif # ifndef __cpp_lib_raw_memory_algorithms -# error "__cpp_lib_raw_memory_algorithms should be defined in c++2a" +# error "__cpp_lib_raw_memory_algorithms should be defined in c++20" # endif # if __cpp_lib_raw_memory_algorithms != 201606L -# error "__cpp_lib_raw_memory_algorithms should have the value 201606L in c++2a" +# error "__cpp_lib_raw_memory_algorithms should have the value 201606L in c++20" # endif # ifndef __cpp_lib_shared_ptr_arrays -# error "__cpp_lib_shared_ptr_arrays should be defined in c++2a" +# error "__cpp_lib_shared_ptr_arrays should be defined in c++20" # endif # if __cpp_lib_shared_ptr_arrays != 201611L -# error "__cpp_lib_shared_ptr_arrays should have the value 201611L in c++2a" +# error "__cpp_lib_shared_ptr_arrays should have the value 201611L in c++20" # endif # ifndef __cpp_lib_shared_ptr_weak_type -# error "__cpp_lib_shared_ptr_weak_type should be defined in c++2a" +# error "__cpp_lib_shared_ptr_weak_type should be defined in c++20" # endif # if __cpp_lib_shared_ptr_weak_type != 201606L -# error "__cpp_lib_shared_ptr_weak_type should have the value 201606L in c++2a" +# error "__cpp_lib_shared_ptr_weak_type should have the value 201606L in c++20" # endif -#endif // TEST_STD_VER > 17 +#endif // TEST_STD_VER == 20 int main(int, char**) { return 0; } diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/mutex.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/mutex.version.pass.cpp index 9dae806b812311..04dd82caf61b25 100644 --- a/libcxx/test/std/language.support/support.limits/support.limits.general/mutex.version.pass.cpp +++ b/libcxx/test/std/language.support/support.limits/support.limits.general/mutex.version.pass.cpp @@ -41,15 +41,15 @@ # error "__cpp_lib_scoped_lock should have the value 201703L in c++17" # endif -#elif TEST_STD_VER > 17 +#elif TEST_STD_VER == 20 # ifndef __cpp_lib_scoped_lock -# error "__cpp_lib_scoped_lock should be defined in c++2a" +# error "__cpp_lib_scoped_lock should be defined in c++20" # endif # if __cpp_lib_scoped_lock != 201703L -# error "__cpp_lib_scoped_lock should have the value 201703L in c++2a" +# error "__cpp_lib_scoped_lock should have the value 201703L in c++20" # endif -#endif // TEST_STD_VER > 17 +#endif // TEST_STD_VER == 20 int main(int, char**) { return 0; } diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/new.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/new.version.pass.cpp index ef834613cad3b3..c8e1f2a4514556 100644 --- a/libcxx/test/std/language.support/support.limits/support.limits.general/new.version.pass.cpp +++ b/libcxx/test/std/language.support/support.limits/support.limits.general/new.version.pass.cpp @@ -14,7 +14,7 @@ // Test the feature test macros defined by /* Constant Value - __cpp_lib_destroying_delete 201806L [C++2a] + __cpp_lib_destroying_delete 201806L [C++20] __cpp_lib_hardware_interference_size 201703L [C++17] __cpp_lib_launder 201606L [C++17] */ @@ -25,7 +25,7 @@ #if TEST_STD_VER < 14 # ifdef __cpp_lib_destroying_delete -# error "__cpp_lib_destroying_delete should not be defined before c++2a" +# error "__cpp_lib_destroying_delete should not be defined before c++20" # endif # ifdef __cpp_lib_hardware_interference_size @@ -39,7 +39,7 @@ #elif TEST_STD_VER == 14 # ifdef __cpp_lib_destroying_delete -# error "__cpp_lib_destroying_delete should not be defined before c++2a" +# error "__cpp_lib_destroying_delete should not be defined before c++20" # endif # ifdef __cpp_lib_hardware_interference_size @@ -53,7 +53,7 @@ #elif TEST_STD_VER == 17 # ifdef __cpp_lib_destroying_delete -# error "__cpp_lib_destroying_delete should not be defined before c++2a" +# error "__cpp_lib_destroying_delete should not be defined before c++20" # endif # if !defined(_LIBCPP_VERSION) @@ -76,14 +76,14 @@ # error "__cpp_lib_launder should have the value 201606L in c++17" # endif -#elif TEST_STD_VER > 17 +#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++2a" +# error "__cpp_lib_destroying_delete should be defined in c++20" # endif # if __cpp_lib_destroying_delete != 201806L -# error "__cpp_lib_destroying_delete should have the value 201806L in c++2a" +# error "__cpp_lib_destroying_delete should have the value 201806L in c++20" # endif # else # ifdef __cpp_lib_destroying_delete @@ -93,10 +93,10 @@ # if !defined(_LIBCPP_VERSION) # ifndef __cpp_lib_hardware_interference_size -# error "__cpp_lib_hardware_interference_size should be defined in c++2a" +# error "__cpp_lib_hardware_interference_size should be defined in c++20" # endif # if __cpp_lib_hardware_interference_size != 201703L -# error "__cpp_lib_hardware_interference_size should have the value 201703L in c++2a" +# error "__cpp_lib_hardware_interference_size should have the value 201703L in c++20" # endif # else // _LIBCPP_VERSION # ifdef __cpp_lib_hardware_interference_size @@ -105,12 +105,12 @@ # endif # ifndef __cpp_lib_launder -# error "__cpp_lib_launder should be defined in c++2a" +# error "__cpp_lib_launder should be defined in c++20" # endif # if __cpp_lib_launder != 201606L -# error "__cpp_lib_launder should have the value 201606L in c++2a" +# error "__cpp_lib_launder should have the value 201606L in c++20" # endif -#endif // TEST_STD_VER > 17 +#endif // TEST_STD_VER == 20 int main(int, char**) { return 0; } diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/numbers.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/numbers.version.pass.cpp index 489b2178e2e9f6..9b2afb28fc15ca 100644 --- a/libcxx/test/std/language.support/support.limits/support.limits.general/numbers.version.pass.cpp +++ b/libcxx/test/std/language.support/support.limits/support.limits.general/numbers.version.pass.cpp @@ -14,7 +14,7 @@ // Test the feature test macros defined by /* Constant Value - __cpp_lib_math_constants 201907L [C++2a] + __cpp_lib_math_constants 201907L [C++20] */ #include @@ -23,29 +23,29 @@ #if TEST_STD_VER < 14 # ifdef __cpp_lib_math_constants -# error "__cpp_lib_math_constants should not be defined before c++2a" +# error "__cpp_lib_math_constants should not be defined before c++20" # endif #elif TEST_STD_VER == 14 # ifdef __cpp_lib_math_constants -# error "__cpp_lib_math_constants should not be defined before c++2a" +# error "__cpp_lib_math_constants should not be defined before c++20" # endif #elif TEST_STD_VER == 17 # ifdef __cpp_lib_math_constants -# error "__cpp_lib_math_constants should not be defined before c++2a" +# error "__cpp_lib_math_constants should not be defined before c++20" # endif -#elif TEST_STD_VER > 17 +#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++2a" +# error "__cpp_lib_math_constants should be defined in c++20" # endif # if __cpp_lib_math_constants != 201907L -# error "__cpp_lib_math_constants should have the value 201907L in c++2a" +# error "__cpp_lib_math_constants should have the value 201907L in c++20" # endif # else # ifdef __cpp_lib_math_constants @@ -53,6 +53,6 @@ # endif # endif -#endif // TEST_STD_VER > 17 +#endif // TEST_STD_VER == 20 int main(int, char**) { return 0; } diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/numeric.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/numeric.version.pass.cpp index 881c81474eb0da..eee46c380e0b6a 100644 --- a/libcxx/test/std/language.support/support.limits/support.limits.general/numeric.version.pass.cpp +++ b/libcxx/test/std/language.support/support.limits/support.limits.general/numeric.version.pass.cpp @@ -14,9 +14,9 @@ // Test the feature test macros defined by /* Constant Value - __cpp_lib_constexpr_numeric 201911L [C++2a] + __cpp_lib_constexpr_numeric 201911L [C++20] __cpp_lib_gcd_lcm 201606L [C++17] - __cpp_lib_interpolate 201902L [C++2a] + __cpp_lib_interpolate 201902L [C++20] __cpp_lib_parallel_algorithm 201603L [C++17] */ @@ -26,7 +26,7 @@ #if TEST_STD_VER < 14 # ifdef __cpp_lib_constexpr_numeric -# error "__cpp_lib_constexpr_numeric should not be defined before c++2a" +# error "__cpp_lib_constexpr_numeric should not be defined before c++20" # endif # ifdef __cpp_lib_gcd_lcm @@ -34,7 +34,7 @@ # endif # ifdef __cpp_lib_interpolate -# error "__cpp_lib_interpolate should not be defined before c++2a" +# error "__cpp_lib_interpolate should not be defined before c++20" # endif # ifdef __cpp_lib_parallel_algorithm @@ -44,7 +44,7 @@ #elif TEST_STD_VER == 14 # ifdef __cpp_lib_constexpr_numeric -# error "__cpp_lib_constexpr_numeric should not be defined before c++2a" +# error "__cpp_lib_constexpr_numeric should not be defined before c++20" # endif # ifdef __cpp_lib_gcd_lcm @@ -52,7 +52,7 @@ # endif # ifdef __cpp_lib_interpolate -# error "__cpp_lib_interpolate should not be defined before c++2a" +# error "__cpp_lib_interpolate should not be defined before c++20" # endif # ifdef __cpp_lib_parallel_algorithm @@ -62,7 +62,7 @@ #elif TEST_STD_VER == 17 # ifdef __cpp_lib_constexpr_numeric -# error "__cpp_lib_constexpr_numeric should not be defined before c++2a" +# error "__cpp_lib_constexpr_numeric should not be defined before c++20" # endif # ifndef __cpp_lib_gcd_lcm @@ -73,7 +73,7 @@ # endif # ifdef __cpp_lib_interpolate -# error "__cpp_lib_interpolate should not be defined before c++2a" +# error "__cpp_lib_interpolate should not be defined before c++20" # endif # if !defined(_LIBCPP_VERSION) @@ -89,35 +89,35 @@ # endif # endif -#elif TEST_STD_VER > 17 +#elif TEST_STD_VER == 20 # ifndef __cpp_lib_constexpr_numeric -# error "__cpp_lib_constexpr_numeric should be defined in c++2a" +# error "__cpp_lib_constexpr_numeric should be defined in c++20" # endif # if __cpp_lib_constexpr_numeric != 201911L -# error "__cpp_lib_constexpr_numeric should have the value 201911L in c++2a" +# error "__cpp_lib_constexpr_numeric should have the value 201911L in c++20" # endif # ifndef __cpp_lib_gcd_lcm -# error "__cpp_lib_gcd_lcm should be defined in c++2a" +# error "__cpp_lib_gcd_lcm should be defined in c++20" # endif # if __cpp_lib_gcd_lcm != 201606L -# error "__cpp_lib_gcd_lcm should have the value 201606L in c++2a" +# error "__cpp_lib_gcd_lcm should have the value 201606L in c++20" # endif # ifndef __cpp_lib_interpolate -# error "__cpp_lib_interpolate should be defined in c++2a" +# error "__cpp_lib_interpolate should be defined in c++20" # endif # if __cpp_lib_interpolate != 201902L -# error "__cpp_lib_interpolate should have the value 201902L in c++2a" +# error "__cpp_lib_interpolate should have the value 201902L in c++20" # endif # if !defined(_LIBCPP_VERSION) # ifndef __cpp_lib_parallel_algorithm -# error "__cpp_lib_parallel_algorithm should be defined in c++2a" +# error "__cpp_lib_parallel_algorithm should be defined in c++20" # endif # if __cpp_lib_parallel_algorithm != 201603L -# error "__cpp_lib_parallel_algorithm should have the value 201603L in c++2a" +# error "__cpp_lib_parallel_algorithm should have the value 201603L in c++20" # endif # else // _LIBCPP_VERSION # ifdef __cpp_lib_parallel_algorithm @@ -125,6 +125,6 @@ # endif # endif -#endif // TEST_STD_VER > 17 +#endif // TEST_STD_VER == 20 int main(int, char**) { return 0; } diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/optional.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/optional.version.pass.cpp index d88fbb0fee804a..1a104470e2df46 100644 --- a/libcxx/test/std/language.support/support.limits/support.limits.general/optional.version.pass.cpp +++ b/libcxx/test/std/language.support/support.limits/support.limits.general/optional.version.pass.cpp @@ -41,15 +41,15 @@ # error "__cpp_lib_optional should have the value 201606L in c++17" # endif -#elif TEST_STD_VER > 17 +#elif TEST_STD_VER == 20 # ifndef __cpp_lib_optional -# error "__cpp_lib_optional should be defined in c++2a" +# error "__cpp_lib_optional should be defined in c++20" # endif # if __cpp_lib_optional != 201606L -# error "__cpp_lib_optional should have the value 201606L in c++2a" +# error "__cpp_lib_optional should have the value 201606L in c++20" # endif -#endif // TEST_STD_VER > 17 +#endif // TEST_STD_VER == 20 int main(int, char**) { return 0; } diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/ostream.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/ostream.version.pass.cpp index bb0737583ba41f..bbc70b147b017f 100644 --- a/libcxx/test/std/language.support/support.limits/support.limits.general/ostream.version.pass.cpp +++ b/libcxx/test/std/language.support/support.limits/support.limits.general/ostream.version.pass.cpp @@ -16,7 +16,7 @@ // Test the feature test macros defined by /* Constant Value - __cpp_lib_char8_t 201811L [C++2a] + __cpp_lib_char8_t 201811L [C++20] */ #include @@ -25,29 +25,29 @@ #if TEST_STD_VER < 14 # ifdef __cpp_lib_char8_t -# error "__cpp_lib_char8_t should not be defined before c++2a" +# error "__cpp_lib_char8_t should not be defined before c++20" # endif #elif TEST_STD_VER == 14 # ifdef __cpp_lib_char8_t -# error "__cpp_lib_char8_t should not be defined before c++2a" +# error "__cpp_lib_char8_t should not be defined before c++20" # endif #elif TEST_STD_VER == 17 # ifdef __cpp_lib_char8_t -# error "__cpp_lib_char8_t should not be defined before c++2a" +# error "__cpp_lib_char8_t should not be defined before c++20" # endif -#elif TEST_STD_VER > 17 +#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++2a" +# error "__cpp_lib_char8_t should be defined in c++20" # endif # if __cpp_lib_char8_t != 201811L -# error "__cpp_lib_char8_t should have the value 201811L in c++2a" +# error "__cpp_lib_char8_t should have the value 201811L in c++20" # endif # else # ifdef __cpp_lib_char8_t @@ -55,6 +55,6 @@ # endif # endif -#endif // TEST_STD_VER > 17 +#endif // TEST_STD_VER == 20 int main(int, char**) { return 0; } diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/regex.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/regex.version.pass.cpp index a73d936dd4ab09..e457dbeadcbd70 100644 --- a/libcxx/test/std/language.support/support.limits/support.limits.general/regex.version.pass.cpp +++ b/libcxx/test/std/language.support/support.limits/support.limits.general/regex.version.pass.cpp @@ -43,15 +43,15 @@ # error "__cpp_lib_nonmember_container_access should have the value 201411L in c++17" # endif -#elif TEST_STD_VER > 17 +#elif TEST_STD_VER == 20 # ifndef __cpp_lib_nonmember_container_access -# error "__cpp_lib_nonmember_container_access should be defined in c++2a" +# error "__cpp_lib_nonmember_container_access should be defined in c++20" # endif # if __cpp_lib_nonmember_container_access != 201411L -# error "__cpp_lib_nonmember_container_access should have the value 201411L in c++2a" +# error "__cpp_lib_nonmember_container_access should have the value 201411L in c++20" # endif -#endif // TEST_STD_VER > 17 +#endif // TEST_STD_VER == 20 int main(int, char**) { return 0; } diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/scoped_allocator.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/scoped_allocator.version.pass.cpp index 2ea98256e1bd49..a44804bbfe7e45 100644 --- a/libcxx/test/std/language.support/support.limits/support.limits.general/scoped_allocator.version.pass.cpp +++ b/libcxx/test/std/language.support/support.limits/support.limits.general/scoped_allocator.version.pass.cpp @@ -41,15 +41,15 @@ # error "__cpp_lib_allocator_traits_is_always_equal should have the value 201411L in c++17" # endif -#elif TEST_STD_VER > 17 +#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++2a" +# error "__cpp_lib_allocator_traits_is_always_equal should be defined in c++20" # 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++2a" +# error "__cpp_lib_allocator_traits_is_always_equal should have the value 201411L in c++20" # endif -#endif // TEST_STD_VER > 17 +#endif // TEST_STD_VER == 20 int main(int, char**) { return 0; } diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/set.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/set.version.pass.cpp index bc26397d6431b8..ae60ce656b6abe 100644 --- a/libcxx/test/std/language.support/support.limits/support.limits.general/set.version.pass.cpp +++ b/libcxx/test/std/language.support/support.limits/support.limits.general/set.version.pass.cpp @@ -15,7 +15,7 @@ /* Constant Value __cpp_lib_allocator_traits_is_always_equal 201411L [C++17] - __cpp_lib_erase_if 202002L [C++2a] + __cpp_lib_erase_if 202002L [C++20] __cpp_lib_generic_associative_lookup 201304L [C++14] __cpp_lib_node_extract 201606L [C++17] __cpp_lib_nonmember_container_access 201411L [C++17] @@ -31,7 +31,7 @@ # endif # ifdef __cpp_lib_erase_if -# error "__cpp_lib_erase_if should not be defined before c++2a" +# error "__cpp_lib_erase_if should not be defined before c++20" # endif # ifdef __cpp_lib_generic_associative_lookup @@ -53,7 +53,7 @@ # endif # ifdef __cpp_lib_erase_if -# error "__cpp_lib_erase_if should not be defined before c++2a" +# error "__cpp_lib_erase_if should not be defined before c++20" # endif # ifndef __cpp_lib_generic_associative_lookup @@ -81,7 +81,7 @@ # endif # ifdef __cpp_lib_erase_if -# error "__cpp_lib_erase_if should not be defined before c++2a" +# error "__cpp_lib_erase_if should not be defined before c++20" # endif # ifndef __cpp_lib_generic_associative_lookup @@ -105,43 +105,43 @@ # error "__cpp_lib_nonmember_container_access should have the value 201411L in c++17" # endif -#elif TEST_STD_VER > 17 +#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++2a" +# error "__cpp_lib_allocator_traits_is_always_equal should be defined in c++20" # 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++2a" +# error "__cpp_lib_allocator_traits_is_always_equal should have the value 201411L in c++20" # endif # ifndef __cpp_lib_erase_if -# error "__cpp_lib_erase_if should be defined in c++2a" +# error "__cpp_lib_erase_if should be defined in c++20" # endif # if __cpp_lib_erase_if != 202002L -# error "__cpp_lib_erase_if should have the value 202002L in c++2a" +# error "__cpp_lib_erase_if should have the value 202002L in c++20" # endif # ifndef __cpp_lib_generic_associative_lookup -# error "__cpp_lib_generic_associative_lookup should be defined in c++2a" +# error "__cpp_lib_generic_associative_lookup should be defined in c++20" # endif # if __cpp_lib_generic_associative_lookup != 201304L -# error "__cpp_lib_generic_associative_lookup should have the value 201304L in c++2a" +# error "__cpp_lib_generic_associative_lookup should have the value 201304L in c++20" # endif # ifndef __cpp_lib_node_extract -# error "__cpp_lib_node_extract should be defined in c++2a" +# error "__cpp_lib_node_extract should be defined in c++20" # endif # if __cpp_lib_node_extract != 201606L -# error "__cpp_lib_node_extract should have the value 201606L in c++2a" +# error "__cpp_lib_node_extract should have the value 201606L in c++20" # endif # ifndef __cpp_lib_nonmember_container_access -# error "__cpp_lib_nonmember_container_access should be defined in c++2a" +# error "__cpp_lib_nonmember_container_access should be defined in c++20" # endif # if __cpp_lib_nonmember_container_access != 201411L -# error "__cpp_lib_nonmember_container_access should have the value 201411L in c++2a" +# error "__cpp_lib_nonmember_container_access should have the value 201411L in c++20" # endif -#endif // TEST_STD_VER > 17 +#endif // TEST_STD_VER == 20 int main(int, char**) { return 0; } diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/shared_mutex.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/shared_mutex.version.pass.cpp index 7c92dfc085cea7..b4b362f8f4ff53 100644 --- a/libcxx/test/std/language.support/support.limits/support.limits.general/shared_mutex.version.pass.cpp +++ b/libcxx/test/std/language.support/support.limits/support.limits.general/shared_mutex.version.pass.cpp @@ -80,14 +80,14 @@ # endif # endif -#elif TEST_STD_VER > 17 +#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++2a" +# error "__cpp_lib_shared_mutex should be defined in c++20" # endif # if __cpp_lib_shared_mutex != 201505L -# error "__cpp_lib_shared_mutex should have the value 201505L in c++2a" +# error "__cpp_lib_shared_mutex should have the value 201505L in c++20" # endif # else # ifdef __cpp_lib_shared_mutex @@ -97,10 +97,10 @@ # if !defined(_LIBCPP_HAS_NO_THREADS) # ifndef __cpp_lib_shared_timed_mutex -# error "__cpp_lib_shared_timed_mutex should be defined in c++2a" +# error "__cpp_lib_shared_timed_mutex should be defined in c++20" # endif # if __cpp_lib_shared_timed_mutex != 201402L -# error "__cpp_lib_shared_timed_mutex should have the value 201402L in c++2a" +# error "__cpp_lib_shared_timed_mutex should have the value 201402L in c++20" # endif # else # ifdef __cpp_lib_shared_timed_mutex @@ -108,6 +108,6 @@ # endif # endif -#endif // TEST_STD_VER > 17 +#endif // TEST_STD_VER == 20 int main(int, char**) { return 0; } diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/span.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/span.version.pass.cpp index c1a9f86327053b..a496714c6149f1 100644 --- a/libcxx/test/std/language.support/support.limits/support.limits.general/span.version.pass.cpp +++ b/libcxx/test/std/language.support/support.limits/support.limits.general/span.version.pass.cpp @@ -14,7 +14,7 @@ // Test the feature test macros defined by /* Constant Value - __cpp_lib_span 202002L [C++2a] + __cpp_lib_span 202002L [C++20] */ #include @@ -23,30 +23,30 @@ #if TEST_STD_VER < 14 # ifdef __cpp_lib_span -# error "__cpp_lib_span should not be defined before c++2a" +# error "__cpp_lib_span should not be defined before c++20" # endif #elif TEST_STD_VER == 14 # ifdef __cpp_lib_span -# error "__cpp_lib_span should not be defined before c++2a" +# error "__cpp_lib_span should not be defined before c++20" # endif #elif TEST_STD_VER == 17 # ifdef __cpp_lib_span -# error "__cpp_lib_span should not be defined before c++2a" +# error "__cpp_lib_span should not be defined before c++20" # endif -#elif TEST_STD_VER > 17 +#elif TEST_STD_VER == 20 # ifndef __cpp_lib_span -# error "__cpp_lib_span should be defined in c++2a" +# error "__cpp_lib_span should be defined in c++20" # endif # if __cpp_lib_span != 202002L -# error "__cpp_lib_span should have the value 202002L in c++2a" +# error "__cpp_lib_span should have the value 202002L in c++20" # endif -#endif // TEST_STD_VER > 17 +#endif // TEST_STD_VER == 20 int main(int, char**) { return 0; } diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/string.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/string.version.pass.cpp index eacd5ff1ecbd0c..aa9aa3285d4b0d 100644 --- a/libcxx/test/std/language.support/support.limits/support.limits.general/string.version.pass.cpp +++ b/libcxx/test/std/language.support/support.limits/support.limits.general/string.version.pass.cpp @@ -15,8 +15,8 @@ /* Constant Value __cpp_lib_allocator_traits_is_always_equal 201411L [C++17] - __cpp_lib_char8_t 201811L [C++2a] - __cpp_lib_erase_if 202002L [C++2a] + __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_udls 201304L [C++14] __cpp_lib_string_view 201606L [C++17] @@ -32,11 +32,11 @@ # endif # ifdef __cpp_lib_char8_t -# error "__cpp_lib_char8_t should not be defined before c++2a" +# error "__cpp_lib_char8_t should not be defined before c++20" # endif # ifdef __cpp_lib_erase_if -# error "__cpp_lib_erase_if should not be defined before c++2a" +# error "__cpp_lib_erase_if should not be defined before c++20" # endif # ifdef __cpp_lib_nonmember_container_access @@ -58,11 +58,11 @@ # endif # ifdef __cpp_lib_char8_t -# error "__cpp_lib_char8_t should not be defined before c++2a" +# error "__cpp_lib_char8_t should not be defined before c++20" # endif # ifdef __cpp_lib_erase_if -# error "__cpp_lib_erase_if should not be defined before c++2a" +# error "__cpp_lib_erase_if should not be defined before c++20" # endif # ifdef __cpp_lib_nonmember_container_access @@ -90,11 +90,11 @@ # endif # ifdef __cpp_lib_char8_t -# error "__cpp_lib_char8_t should not be defined before c++2a" +# error "__cpp_lib_char8_t should not be defined before c++20" # endif # ifdef __cpp_lib_erase_if -# error "__cpp_lib_erase_if should not be defined before c++2a" +# error "__cpp_lib_erase_if should not be defined before c++20" # endif # ifndef __cpp_lib_nonmember_container_access @@ -118,21 +118,21 @@ # error "__cpp_lib_string_view should have the value 201606L in c++17" # endif -#elif TEST_STD_VER > 17 +#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++2a" +# error "__cpp_lib_allocator_traits_is_always_equal should be defined in c++20" # 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++2a" +# error "__cpp_lib_allocator_traits_is_always_equal should have the value 201411L in c++20" # endif # if defined(__cpp_char8_t) # ifndef __cpp_lib_char8_t -# error "__cpp_lib_char8_t should be defined in c++2a" +# error "__cpp_lib_char8_t should be defined in c++20" # endif # if __cpp_lib_char8_t != 201811L -# error "__cpp_lib_char8_t should have the value 201811L in c++2a" +# error "__cpp_lib_char8_t should have the value 201811L in c++20" # endif # else # ifdef __cpp_lib_char8_t @@ -141,33 +141,33 @@ # endif # ifndef __cpp_lib_erase_if -# error "__cpp_lib_erase_if should be defined in c++2a" +# error "__cpp_lib_erase_if should be defined in c++20" # endif # if __cpp_lib_erase_if != 202002L -# error "__cpp_lib_erase_if should have the value 202002L in c++2a" +# error "__cpp_lib_erase_if should have the value 202002L in c++20" # endif # ifndef __cpp_lib_nonmember_container_access -# error "__cpp_lib_nonmember_container_access should be defined in c++2a" +# error "__cpp_lib_nonmember_container_access should be defined in c++20" # endif # if __cpp_lib_nonmember_container_access != 201411L -# error "__cpp_lib_nonmember_container_access should have the value 201411L in c++2a" +# error "__cpp_lib_nonmember_container_access should have the value 201411L in c++20" # endif # ifndef __cpp_lib_string_udls -# error "__cpp_lib_string_udls should be defined in c++2a" +# error "__cpp_lib_string_udls should be defined in c++20" # endif # if __cpp_lib_string_udls != 201304L -# error "__cpp_lib_string_udls should have the value 201304L in c++2a" +# error "__cpp_lib_string_udls should have the value 201304L in c++20" # endif # ifndef __cpp_lib_string_view -# error "__cpp_lib_string_view should be defined in c++2a" +# error "__cpp_lib_string_view should be defined in c++20" # endif # if __cpp_lib_string_view != 201606L -# error "__cpp_lib_string_view should have the value 201606L in c++2a" +# error "__cpp_lib_string_view should have the value 201606L in c++20" # endif -#endif // TEST_STD_VER > 17 +#endif // TEST_STD_VER == 20 int main(int, char**) { return 0; } diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/string_view.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/string_view.version.pass.cpp index 1fca20d41f8cd5..d489b63932e057 100644 --- a/libcxx/test/std/language.support/support.limits/support.limits.general/string_view.version.pass.cpp +++ b/libcxx/test/std/language.support/support.limits/support.limits.general/string_view.version.pass.cpp @@ -14,7 +14,7 @@ // Test the feature test macros defined by /* Constant Value - __cpp_lib_char8_t 201811L [C++2a] + __cpp_lib_char8_t 201811L [C++20] __cpp_lib_string_view 201606L [C++17] */ @@ -24,7 +24,7 @@ #if TEST_STD_VER < 14 # ifdef __cpp_lib_char8_t -# error "__cpp_lib_char8_t should not be defined before c++2a" +# error "__cpp_lib_char8_t should not be defined before c++20" # endif # ifdef __cpp_lib_string_view @@ -34,7 +34,7 @@ #elif TEST_STD_VER == 14 # ifdef __cpp_lib_char8_t -# error "__cpp_lib_char8_t should not be defined before c++2a" +# error "__cpp_lib_char8_t should not be defined before c++20" # endif # ifdef __cpp_lib_string_view @@ -44,7 +44,7 @@ #elif TEST_STD_VER == 17 # ifdef __cpp_lib_char8_t -# error "__cpp_lib_char8_t should not be defined before c++2a" +# error "__cpp_lib_char8_t should not be defined before c++20" # endif # ifndef __cpp_lib_string_view @@ -54,14 +54,14 @@ # error "__cpp_lib_string_view should have the value 201606L in c++17" # endif -#elif TEST_STD_VER > 17 +#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++2a" +# error "__cpp_lib_char8_t should be defined in c++20" # endif # if __cpp_lib_char8_t != 201811L -# error "__cpp_lib_char8_t should have the value 201811L in c++2a" +# error "__cpp_lib_char8_t should have the value 201811L in c++20" # endif # else # ifdef __cpp_lib_char8_t @@ -70,12 +70,12 @@ # endif # ifndef __cpp_lib_string_view -# error "__cpp_lib_string_view should be defined in c++2a" +# error "__cpp_lib_string_view should be defined in c++20" # endif # if __cpp_lib_string_view != 201606L -# error "__cpp_lib_string_view should have the value 201606L in c++2a" +# error "__cpp_lib_string_view should have the value 201606L in c++20" # endif -#endif // TEST_STD_VER > 17 +#endif // TEST_STD_VER == 20 int main(int, char**) { return 0; } diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/tuple.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/tuple.version.pass.cpp index e4c3d54d1982c2..556ed84027faee 100644 --- a/libcxx/test/std/language.support/support.limits/support.limits.general/tuple.version.pass.cpp +++ b/libcxx/test/std/language.support/support.limits/support.limits.general/tuple.version.pass.cpp @@ -95,36 +95,36 @@ # error "__cpp_lib_tuples_by_type should have the value 201304L in c++17" # endif -#elif TEST_STD_VER > 17 +#elif TEST_STD_VER == 20 # ifndef __cpp_lib_apply -# error "__cpp_lib_apply should be defined in c++2a" +# error "__cpp_lib_apply should be defined in c++20" # endif # if __cpp_lib_apply != 201603L -# error "__cpp_lib_apply should have the value 201603L in c++2a" +# error "__cpp_lib_apply should have the value 201603L in c++20" # endif # ifndef __cpp_lib_make_from_tuple -# error "__cpp_lib_make_from_tuple should be defined in c++2a" +# error "__cpp_lib_make_from_tuple should be defined in c++20" # endif # if __cpp_lib_make_from_tuple != 201606L -# error "__cpp_lib_make_from_tuple should have the value 201606L in c++2a" +# error "__cpp_lib_make_from_tuple should have the value 201606L in c++20" # endif # ifndef __cpp_lib_tuple_element_t -# error "__cpp_lib_tuple_element_t should be defined in c++2a" +# error "__cpp_lib_tuple_element_t should be defined in c++20" # endif # if __cpp_lib_tuple_element_t != 201402L -# error "__cpp_lib_tuple_element_t should have the value 201402L in c++2a" +# error "__cpp_lib_tuple_element_t should have the value 201402L in c++20" # endif # ifndef __cpp_lib_tuples_by_type -# error "__cpp_lib_tuples_by_type should be defined in c++2a" +# error "__cpp_lib_tuples_by_type should be defined in c++20" # endif # if __cpp_lib_tuples_by_type != 201304L -# error "__cpp_lib_tuples_by_type should have the value 201304L in c++2a" +# error "__cpp_lib_tuples_by_type should have the value 201304L in c++20" # endif -#endif // TEST_STD_VER > 17 +#endif // TEST_STD_VER == 20 int main(int, char**) { return 0; } diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/type_traits.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/type_traits.version.pass.cpp index 29e76b36e4c1f4..487fc8d68cb7cf 100644 --- a/libcxx/test/std/language.support/support.limits/support.limits.general/type_traits.version.pass.cpp +++ b/libcxx/test/std/language.support/support.limits/support.limits.general/type_traits.version.pass.cpp @@ -18,7 +18,7 @@ __cpp_lib_has_unique_object_representations 201606L [C++17] __cpp_lib_integral_constant_callable 201304L [C++14] __cpp_lib_is_aggregate 201703L [C++17] - __cpp_lib_is_constant_evaluated 201811L [C++2a] + __cpp_lib_is_constant_evaluated 201811L [C++20] __cpp_lib_is_final 201402L [C++14] __cpp_lib_is_invocable 201703L [C++17] __cpp_lib_is_null_pointer 201309L [C++14] @@ -52,7 +52,7 @@ # endif # ifdef __cpp_lib_is_constant_evaluated -# error "__cpp_lib_is_constant_evaluated should not be defined before c++2a" +# error "__cpp_lib_is_constant_evaluated should not be defined before c++20" # endif # ifdef __cpp_lib_is_final @@ -113,7 +113,7 @@ # endif # ifdef __cpp_lib_is_constant_evaluated -# error "__cpp_lib_is_constant_evaluated should not be defined before c++2a" +# error "__cpp_lib_is_constant_evaluated should not be defined before c++20" # endif # ifndef __cpp_lib_is_final @@ -207,7 +207,7 @@ # endif # ifdef __cpp_lib_is_constant_evaluated -# error "__cpp_lib_is_constant_evaluated should not be defined before c++2a" +# error "__cpp_lib_is_constant_evaluated should not be defined before c++20" # endif # ifndef __cpp_lib_is_final @@ -273,21 +273,21 @@ # error "__cpp_lib_void_t should have the value 201411L in c++17" # endif -#elif TEST_STD_VER > 17 +#elif TEST_STD_VER == 20 # ifndef __cpp_lib_bool_constant -# error "__cpp_lib_bool_constant should be defined in c++2a" +# error "__cpp_lib_bool_constant should be defined in c++20" # endif # if __cpp_lib_bool_constant != 201505L -# error "__cpp_lib_bool_constant should have the value 201505L in c++2a" +# error "__cpp_lib_bool_constant should have the value 201505L in c++20" # 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++2a" +# error "__cpp_lib_has_unique_object_representations should be defined in c++20" # endif # if __cpp_lib_has_unique_object_representations != 201606L -# error "__cpp_lib_has_unique_object_representations should have the value 201606L in c++2a" +# error "__cpp_lib_has_unique_object_representations should have the value 201606L in c++20" # endif # else # ifdef __cpp_lib_has_unique_object_representations @@ -296,18 +296,18 @@ # endif # ifndef __cpp_lib_integral_constant_callable -# error "__cpp_lib_integral_constant_callable should be defined in c++2a" +# error "__cpp_lib_integral_constant_callable should be defined in c++20" # endif # if __cpp_lib_integral_constant_callable != 201304L -# error "__cpp_lib_integral_constant_callable should have the value 201304L in c++2a" +# error "__cpp_lib_integral_constant_callable should have the value 201304L in c++20" # 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++2a" +# error "__cpp_lib_is_aggregate should be defined in c++20" # endif # if __cpp_lib_is_aggregate != 201703L -# error "__cpp_lib_is_aggregate should have the value 201703L in c++2a" +# error "__cpp_lib_is_aggregate should have the value 201703L in c++20" # endif # else # ifdef __cpp_lib_is_aggregate @@ -317,10 +317,10 @@ # 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++2a" +# error "__cpp_lib_is_constant_evaluated should be defined in c++20" # endif # if __cpp_lib_is_constant_evaluated != 201811L -# error "__cpp_lib_is_constant_evaluated should have the value 201811L in c++2a" +# error "__cpp_lib_is_constant_evaluated should have the value 201811L in c++20" # endif # else # ifdef __cpp_lib_is_constant_evaluated @@ -329,68 +329,68 @@ # endif # ifndef __cpp_lib_is_final -# error "__cpp_lib_is_final should be defined in c++2a" +# error "__cpp_lib_is_final should be defined in c++20" # endif # if __cpp_lib_is_final != 201402L -# error "__cpp_lib_is_final should have the value 201402L in c++2a" +# error "__cpp_lib_is_final should have the value 201402L in c++20" # endif # ifndef __cpp_lib_is_invocable -# error "__cpp_lib_is_invocable should be defined in c++2a" +# error "__cpp_lib_is_invocable should be defined in c++20" # endif # if __cpp_lib_is_invocable != 201703L -# error "__cpp_lib_is_invocable should have the value 201703L in c++2a" +# error "__cpp_lib_is_invocable should have the value 201703L in c++20" # endif # ifndef __cpp_lib_is_null_pointer -# error "__cpp_lib_is_null_pointer should be defined in c++2a" +# error "__cpp_lib_is_null_pointer should be defined in c++20" # endif # if __cpp_lib_is_null_pointer != 201309L -# error "__cpp_lib_is_null_pointer should have the value 201309L in c++2a" +# error "__cpp_lib_is_null_pointer should have the value 201309L in c++20" # endif # ifndef __cpp_lib_is_swappable -# error "__cpp_lib_is_swappable should be defined in c++2a" +# error "__cpp_lib_is_swappable should be defined in c++20" # endif # if __cpp_lib_is_swappable != 201603L -# error "__cpp_lib_is_swappable should have the value 201603L in c++2a" +# error "__cpp_lib_is_swappable should have the value 201603L in c++20" # endif # ifndef __cpp_lib_logical_traits -# error "__cpp_lib_logical_traits should be defined in c++2a" +# error "__cpp_lib_logical_traits should be defined in c++20" # endif # if __cpp_lib_logical_traits != 201510L -# error "__cpp_lib_logical_traits should have the value 201510L in c++2a" +# error "__cpp_lib_logical_traits should have the value 201510L in c++20" # endif # ifndef __cpp_lib_result_of_sfinae -# error "__cpp_lib_result_of_sfinae should be defined in c++2a" +# error "__cpp_lib_result_of_sfinae should be defined in c++20" # endif # if __cpp_lib_result_of_sfinae != 201210L -# error "__cpp_lib_result_of_sfinae should have the value 201210L in c++2a" +# error "__cpp_lib_result_of_sfinae should have the value 201210L in c++20" # endif # ifndef __cpp_lib_transformation_trait_aliases -# error "__cpp_lib_transformation_trait_aliases should be defined in c++2a" +# error "__cpp_lib_transformation_trait_aliases should be defined in c++20" # endif # if __cpp_lib_transformation_trait_aliases != 201304L -# error "__cpp_lib_transformation_trait_aliases should have the value 201304L in c++2a" +# error "__cpp_lib_transformation_trait_aliases should have the value 201304L in c++20" # endif # ifndef __cpp_lib_type_trait_variable_templates -# error "__cpp_lib_type_trait_variable_templates should be defined in c++2a" +# error "__cpp_lib_type_trait_variable_templates should be defined in c++20" # endif # if __cpp_lib_type_trait_variable_templates != 201510L -# error "__cpp_lib_type_trait_variable_templates should have the value 201510L in c++2a" +# error "__cpp_lib_type_trait_variable_templates should have the value 201510L in c++20" # endif # ifndef __cpp_lib_void_t -# error "__cpp_lib_void_t should be defined in c++2a" +# error "__cpp_lib_void_t should be defined in c++20" # endif # if __cpp_lib_void_t != 201411L -# error "__cpp_lib_void_t should have the value 201411L in c++2a" +# error "__cpp_lib_void_t should have the value 201411L in c++20" # endif -#endif // TEST_STD_VER > 17 +#endif // TEST_STD_VER == 20 int main(int, char**) { return 0; } diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/unordered_map.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/unordered_map.version.pass.cpp index a3365f40b9bbdc..f37efd5752e5f4 100644 --- a/libcxx/test/std/language.support/support.limits/support.limits.general/unordered_map.version.pass.cpp +++ b/libcxx/test/std/language.support/support.limits/support.limits.general/unordered_map.version.pass.cpp @@ -15,8 +15,8 @@ /* Constant Value __cpp_lib_allocator_traits_is_always_equal 201411L [C++17] - __cpp_lib_erase_if 202002L [C++2a] - __cpp_lib_generic_unordered_lookup 201811L [C++2a] + __cpp_lib_erase_if 202002L [C++20] + __cpp_lib_generic_unordered_lookup 201811L [C++20] __cpp_lib_node_extract 201606L [C++17] __cpp_lib_nonmember_container_access 201411L [C++17] __cpp_lib_unordered_map_try_emplace 201411L [C++17] @@ -32,11 +32,11 @@ # endif # ifdef __cpp_lib_erase_if -# error "__cpp_lib_erase_if should not be defined before c++2a" +# error "__cpp_lib_erase_if should not be defined before c++20" # endif # ifdef __cpp_lib_generic_unordered_lookup -# error "__cpp_lib_generic_unordered_lookup should not be defined before c++2a" +# error "__cpp_lib_generic_unordered_lookup should not be defined before c++20" # endif # ifdef __cpp_lib_node_extract @@ -58,11 +58,11 @@ # endif # ifdef __cpp_lib_erase_if -# error "__cpp_lib_erase_if should not be defined before c++2a" +# error "__cpp_lib_erase_if should not be defined before c++20" # endif # ifdef __cpp_lib_generic_unordered_lookup -# error "__cpp_lib_generic_unordered_lookup should not be defined before c++2a" +# error "__cpp_lib_generic_unordered_lookup should not be defined before c++20" # endif # ifdef __cpp_lib_node_extract @@ -87,11 +87,11 @@ # endif # ifdef __cpp_lib_erase_if -# error "__cpp_lib_erase_if should not be defined before c++2a" +# error "__cpp_lib_erase_if should not be defined before c++20" # endif # ifdef __cpp_lib_generic_unordered_lookup -# error "__cpp_lib_generic_unordered_lookup should not be defined before c++2a" +# error "__cpp_lib_generic_unordered_lookup should not be defined before c++20" # endif # ifndef __cpp_lib_node_extract @@ -115,50 +115,50 @@ # error "__cpp_lib_unordered_map_try_emplace should have the value 201411L in c++17" # endif -#elif TEST_STD_VER > 17 +#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++2a" +# error "__cpp_lib_allocator_traits_is_always_equal should be defined in c++20" # 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++2a" +# error "__cpp_lib_allocator_traits_is_always_equal should have the value 201411L in c++20" # endif # ifndef __cpp_lib_erase_if -# error "__cpp_lib_erase_if should be defined in c++2a" +# error "__cpp_lib_erase_if should be defined in c++20" # endif # if __cpp_lib_erase_if != 202002L -# error "__cpp_lib_erase_if should have the value 202002L in c++2a" +# error "__cpp_lib_erase_if should have the value 202002L in c++20" # endif # ifndef __cpp_lib_generic_unordered_lookup -# error "__cpp_lib_generic_unordered_lookup should be defined in c++2a" +# error "__cpp_lib_generic_unordered_lookup should be defined in c++20" # endif # if __cpp_lib_generic_unordered_lookup != 201811L -# error "__cpp_lib_generic_unordered_lookup should have the value 201811L in c++2a" +# error "__cpp_lib_generic_unordered_lookup should have the value 201811L in c++20" # endif # ifndef __cpp_lib_node_extract -# error "__cpp_lib_node_extract should be defined in c++2a" +# error "__cpp_lib_node_extract should be defined in c++20" # endif # if __cpp_lib_node_extract != 201606L -# error "__cpp_lib_node_extract should have the value 201606L in c++2a" +# error "__cpp_lib_node_extract should have the value 201606L in c++20" # endif # ifndef __cpp_lib_nonmember_container_access -# error "__cpp_lib_nonmember_container_access should be defined in c++2a" +# error "__cpp_lib_nonmember_container_access should be defined in c++20" # endif # if __cpp_lib_nonmember_container_access != 201411L -# error "__cpp_lib_nonmember_container_access should have the value 201411L in c++2a" +# error "__cpp_lib_nonmember_container_access should have the value 201411L in c++20" # endif # ifndef __cpp_lib_unordered_map_try_emplace -# error "__cpp_lib_unordered_map_try_emplace should be defined in c++2a" +# error "__cpp_lib_unordered_map_try_emplace should be defined in c++20" # endif # if __cpp_lib_unordered_map_try_emplace != 201411L -# error "__cpp_lib_unordered_map_try_emplace should have the value 201411L in c++2a" +# error "__cpp_lib_unordered_map_try_emplace should have the value 201411L in c++20" # endif -#endif // TEST_STD_VER > 17 +#endif // TEST_STD_VER == 20 int main(int, char**) { return 0; } diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/unordered_set.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/unordered_set.version.pass.cpp index 1cd59235ab8231..21e960057d2026 100644 --- a/libcxx/test/std/language.support/support.limits/support.limits.general/unordered_set.version.pass.cpp +++ b/libcxx/test/std/language.support/support.limits/support.limits.general/unordered_set.version.pass.cpp @@ -15,8 +15,8 @@ /* Constant Value __cpp_lib_allocator_traits_is_always_equal 201411L [C++17] - __cpp_lib_erase_if 202002L [C++2a] - __cpp_lib_generic_unordered_lookup 201811L [C++2a] + __cpp_lib_erase_if 202002L [C++20] + __cpp_lib_generic_unordered_lookup 201811L [C++20] __cpp_lib_node_extract 201606L [C++17] __cpp_lib_nonmember_container_access 201411L [C++17] */ @@ -31,11 +31,11 @@ # endif # ifdef __cpp_lib_erase_if -# error "__cpp_lib_erase_if should not be defined before c++2a" +# error "__cpp_lib_erase_if should not be defined before c++20" # endif # ifdef __cpp_lib_generic_unordered_lookup -# error "__cpp_lib_generic_unordered_lookup should not be defined before c++2a" +# error "__cpp_lib_generic_unordered_lookup should not be defined before c++20" # endif # ifdef __cpp_lib_node_extract @@ -53,11 +53,11 @@ # endif # ifdef __cpp_lib_erase_if -# error "__cpp_lib_erase_if should not be defined before c++2a" +# error "__cpp_lib_erase_if should not be defined before c++20" # endif # ifdef __cpp_lib_generic_unordered_lookup -# error "__cpp_lib_generic_unordered_lookup should not be defined before c++2a" +# error "__cpp_lib_generic_unordered_lookup should not be defined before c++20" # endif # ifdef __cpp_lib_node_extract @@ -78,11 +78,11 @@ # endif # ifdef __cpp_lib_erase_if -# error "__cpp_lib_erase_if should not be defined before c++2a" +# error "__cpp_lib_erase_if should not be defined before c++20" # endif # ifdef __cpp_lib_generic_unordered_lookup -# error "__cpp_lib_generic_unordered_lookup should not be defined before c++2a" +# error "__cpp_lib_generic_unordered_lookup should not be defined before c++20" # endif # ifndef __cpp_lib_node_extract @@ -99,43 +99,43 @@ # error "__cpp_lib_nonmember_container_access should have the value 201411L in c++17" # endif -#elif TEST_STD_VER > 17 +#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++2a" +# error "__cpp_lib_allocator_traits_is_always_equal should be defined in c++20" # 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++2a" +# error "__cpp_lib_allocator_traits_is_always_equal should have the value 201411L in c++20" # endif # ifndef __cpp_lib_erase_if -# error "__cpp_lib_erase_if should be defined in c++2a" +# error "__cpp_lib_erase_if should be defined in c++20" # endif # if __cpp_lib_erase_if != 202002L -# error "__cpp_lib_erase_if should have the value 202002L in c++2a" +# error "__cpp_lib_erase_if should have the value 202002L in c++20" # endif # ifndef __cpp_lib_generic_unordered_lookup -# error "__cpp_lib_generic_unordered_lookup should be defined in c++2a" +# error "__cpp_lib_generic_unordered_lookup should be defined in c++20" # endif # if __cpp_lib_generic_unordered_lookup != 201811L -# error "__cpp_lib_generic_unordered_lookup should have the value 201811L in c++2a" +# error "__cpp_lib_generic_unordered_lookup should have the value 201811L in c++20" # endif # ifndef __cpp_lib_node_extract -# error "__cpp_lib_node_extract should be defined in c++2a" +# error "__cpp_lib_node_extract should be defined in c++20" # endif # if __cpp_lib_node_extract != 201606L -# error "__cpp_lib_node_extract should have the value 201606L in c++2a" +# error "__cpp_lib_node_extract should have the value 201606L in c++20" # endif # ifndef __cpp_lib_nonmember_container_access -# error "__cpp_lib_nonmember_container_access should be defined in c++2a" +# error "__cpp_lib_nonmember_container_access should be defined in c++20" # endif # if __cpp_lib_nonmember_container_access != 201411L -# error "__cpp_lib_nonmember_container_access should have the value 201411L in c++2a" +# error "__cpp_lib_nonmember_container_access should have the value 201411L in c++20" # endif -#endif // TEST_STD_VER > 17 +#endif // TEST_STD_VER == 20 int main(int, char**) { return 0; } diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/utility.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/utility.version.pass.cpp index 63f755e66047f6..a5e1d715b307ef 100644 --- a/libcxx/test/std/language.support/support.limits/support.limits.general/utility.version.pass.cpp +++ b/libcxx/test/std/language.support/support.limits/support.limits.general/utility.version.pass.cpp @@ -15,7 +15,7 @@ /* Constant Value __cpp_lib_as_const 201510L [C++17] - __cpp_lib_constexpr_utility 201811L [C++2a] + __cpp_lib_constexpr_utility 201811L [C++20] __cpp_lib_exchange_function 201304L [C++14] __cpp_lib_integer_sequence 201304L [C++14] __cpp_lib_to_chars 201611L [C++17] @@ -32,7 +32,7 @@ # endif # ifdef __cpp_lib_constexpr_utility -# error "__cpp_lib_constexpr_utility should not be defined before c++2a" +# error "__cpp_lib_constexpr_utility should not be defined before c++20" # endif # ifdef __cpp_lib_exchange_function @@ -58,7 +58,7 @@ # endif # ifdef __cpp_lib_constexpr_utility -# error "__cpp_lib_constexpr_utility should not be defined before c++2a" +# error "__cpp_lib_constexpr_utility should not be defined before c++20" # endif # ifndef __cpp_lib_exchange_function @@ -96,7 +96,7 @@ # endif # ifdef __cpp_lib_constexpr_utility -# error "__cpp_lib_constexpr_utility should not be defined before c++2a" +# error "__cpp_lib_constexpr_utility should not be defined before c++20" # endif # ifndef __cpp_lib_exchange_function @@ -133,42 +133,42 @@ # error "__cpp_lib_tuples_by_type should have the value 201304L in c++17" # endif -#elif TEST_STD_VER > 17 +#elif TEST_STD_VER == 20 # ifndef __cpp_lib_as_const -# error "__cpp_lib_as_const should be defined in c++2a" +# error "__cpp_lib_as_const should be defined in c++20" # endif # if __cpp_lib_as_const != 201510L -# error "__cpp_lib_as_const should have the value 201510L in c++2a" +# error "__cpp_lib_as_const should have the value 201510L in c++20" # endif # ifndef __cpp_lib_constexpr_utility -# error "__cpp_lib_constexpr_utility should be defined in c++2a" +# error "__cpp_lib_constexpr_utility should be defined in c++20" # endif # if __cpp_lib_constexpr_utility != 201811L -# error "__cpp_lib_constexpr_utility should have the value 201811L in c++2a" +# error "__cpp_lib_constexpr_utility should have the value 201811L in c++20" # endif # ifndef __cpp_lib_exchange_function -# error "__cpp_lib_exchange_function should be defined in c++2a" +# error "__cpp_lib_exchange_function should be defined in c++20" # endif # if __cpp_lib_exchange_function != 201304L -# error "__cpp_lib_exchange_function should have the value 201304L in c++2a" +# error "__cpp_lib_exchange_function should have the value 201304L in c++20" # endif # ifndef __cpp_lib_integer_sequence -# error "__cpp_lib_integer_sequence should be defined in c++2a" +# error "__cpp_lib_integer_sequence should be defined in c++20" # endif # if __cpp_lib_integer_sequence != 201304L -# error "__cpp_lib_integer_sequence should have the value 201304L in c++2a" +# error "__cpp_lib_integer_sequence should have the value 201304L in c++20" # endif # if !defined(_LIBCPP_VERSION) # ifndef __cpp_lib_to_chars -# error "__cpp_lib_to_chars should be defined in c++2a" +# error "__cpp_lib_to_chars should be defined in c++20" # endif # if __cpp_lib_to_chars != 201611L -# error "__cpp_lib_to_chars should have the value 201611L in c++2a" +# error "__cpp_lib_to_chars should have the value 201611L in c++20" # endif # else // _LIBCPP_VERSION # ifdef __cpp_lib_to_chars @@ -177,12 +177,12 @@ # endif # ifndef __cpp_lib_tuples_by_type -# error "__cpp_lib_tuples_by_type should be defined in c++2a" +# error "__cpp_lib_tuples_by_type should be defined in c++20" # endif # if __cpp_lib_tuples_by_type != 201304L -# error "__cpp_lib_tuples_by_type should have the value 201304L in c++2a" +# error "__cpp_lib_tuples_by_type should have the value 201304L in c++20" # endif -#endif // TEST_STD_VER > 17 +#endif // TEST_STD_VER == 20 int main(int, char**) { return 0; } diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/variant.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/variant.version.pass.cpp index 7a17307460d81f..6e8c1ae436817e 100644 --- a/libcxx/test/std/language.support/support.limits/support.limits.general/variant.version.pass.cpp +++ b/libcxx/test/std/language.support/support.limits/support.limits.general/variant.version.pass.cpp @@ -41,15 +41,15 @@ # error "__cpp_lib_variant should have the value 201606L in c++17" # endif -#elif TEST_STD_VER > 17 +#elif TEST_STD_VER == 20 # ifndef __cpp_lib_variant -# error "__cpp_lib_variant should be defined in c++2a" +# error "__cpp_lib_variant should be defined in c++20" # endif # if __cpp_lib_variant != 201606L -# error "__cpp_lib_variant should have the value 201606L in c++2a" +# error "__cpp_lib_variant should have the value 201606L in c++20" # endif -#endif // TEST_STD_VER > 17 +#endif // TEST_STD_VER == 20 int main(int, char**) { return 0; } diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/vector.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/vector.version.pass.cpp index 60bba44446c6f8..13e869dd205a95 100644 --- a/libcxx/test/std/language.support/support.limits/support.limits.general/vector.version.pass.cpp +++ b/libcxx/test/std/language.support/support.limits/support.limits.general/vector.version.pass.cpp @@ -15,7 +15,7 @@ /* Constant Value __cpp_lib_allocator_traits_is_always_equal 201411L [C++17] - __cpp_lib_erase_if 202002L [C++2a] + __cpp_lib_erase_if 202002L [C++20] __cpp_lib_incomplete_container_elements 201505L [C++17] __cpp_lib_nonmember_container_access 201411L [C++17] */ @@ -30,7 +30,7 @@ # endif # ifdef __cpp_lib_erase_if -# error "__cpp_lib_erase_if should not be defined before c++2a" +# error "__cpp_lib_erase_if should not be defined before c++20" # endif # ifdef __cpp_lib_incomplete_container_elements @@ -48,7 +48,7 @@ # endif # ifdef __cpp_lib_erase_if -# error "__cpp_lib_erase_if should not be defined before c++2a" +# error "__cpp_lib_erase_if should not be defined before c++20" # endif # ifdef __cpp_lib_incomplete_container_elements @@ -69,7 +69,7 @@ # endif # ifdef __cpp_lib_erase_if -# error "__cpp_lib_erase_if should not be defined before c++2a" +# error "__cpp_lib_erase_if should not be defined before c++20" # endif # ifndef __cpp_lib_incomplete_container_elements @@ -86,36 +86,36 @@ # error "__cpp_lib_nonmember_container_access should have the value 201411L in c++17" # endif -#elif TEST_STD_VER > 17 +#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++2a" +# error "__cpp_lib_allocator_traits_is_always_equal should be defined in c++20" # 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++2a" +# error "__cpp_lib_allocator_traits_is_always_equal should have the value 201411L in c++20" # endif # ifndef __cpp_lib_erase_if -# error "__cpp_lib_erase_if should be defined in c++2a" +# error "__cpp_lib_erase_if should be defined in c++20" # endif # if __cpp_lib_erase_if != 202002L -# error "__cpp_lib_erase_if should have the value 202002L in c++2a" +# error "__cpp_lib_erase_if should have the value 202002L in c++20" # endif # ifndef __cpp_lib_incomplete_container_elements -# error "__cpp_lib_incomplete_container_elements should be defined in c++2a" +# error "__cpp_lib_incomplete_container_elements should be defined in c++20" # endif # if __cpp_lib_incomplete_container_elements != 201505L -# error "__cpp_lib_incomplete_container_elements should have the value 201505L in c++2a" +# error "__cpp_lib_incomplete_container_elements should have the value 201505L in c++20" # endif # ifndef __cpp_lib_nonmember_container_access -# error "__cpp_lib_nonmember_container_access should be defined in c++2a" +# error "__cpp_lib_nonmember_container_access should be defined in c++20" # endif # if __cpp_lib_nonmember_container_access != 201411L -# error "__cpp_lib_nonmember_container_access should have the value 201411L in c++2a" +# error "__cpp_lib_nonmember_container_access should have the value 201411L in c++20" # endif -#endif // TEST_STD_VER > 17 +#endif // TEST_STD_VER == 20 int main(int, char**) { return 0; } diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/version.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/version.version.pass.cpp index e37907185db138..3f5ff3cdaeaf57 100644 --- a/libcxx/test/std/language.support/support.limits/support.limits.general/version.version.pass.cpp +++ b/libcxx/test/std/language.support/support.limits/support.limits.general/version.version.pass.cpp @@ -19,65 +19,65 @@ __cpp_lib_any 201606L [C++17] __cpp_lib_apply 201603L [C++17] __cpp_lib_array_constexpr 201603L [C++17] - 201811L [C++2a] + 201811L [C++20] __cpp_lib_as_const 201510L [C++17] - __cpp_lib_atomic_flag_test 201907L [C++2a] - __cpp_lib_atomic_float 201711L [C++2a] + __cpp_lib_atomic_flag_test 201907L [C++20] + __cpp_lib_atomic_float 201711L [C++20] __cpp_lib_atomic_is_always_lock_free 201603L [C++17] - __cpp_lib_atomic_lock_free_type_aliases 201907L [C++2a] - __cpp_lib_atomic_ref 201806L [C++2a] - __cpp_lib_atomic_shared_ptr 201711L [C++2a] - __cpp_lib_atomic_value_initialization 201911L [C++2a] - __cpp_lib_atomic_wait 201907L [C++2a] - __cpp_lib_bind_front 201811L [C++2a] - __cpp_lib_bit_cast 201806L [C++2a] + __cpp_lib_atomic_lock_free_type_aliases 201907L [C++20] + __cpp_lib_atomic_ref 201806L [C++20] + __cpp_lib_atomic_shared_ptr 201711L [C++20] + __cpp_lib_atomic_value_initialization 201911L [C++20] + __cpp_lib_atomic_wait 201907L [C++20] + __cpp_lib_bind_front 201811L [C++20] + __cpp_lib_bit_cast 201806L [C++20] __cpp_lib_bool_constant 201505L [C++17] __cpp_lib_boyer_moore_searcher 201603L [C++17] __cpp_lib_byte 201603L [C++17] - __cpp_lib_char8_t 201811L [C++2a] + __cpp_lib_char8_t 201811L [C++20] __cpp_lib_chrono 201611L [C++17] __cpp_lib_chrono_udls 201304L [C++14] __cpp_lib_clamp 201603L [C++17] __cpp_lib_complex_udls 201309L [C++14] - __cpp_lib_concepts 201806L [C++2a] - __cpp_lib_constexpr_dynamic_alloc 201907L [C++2a] - __cpp_lib_constexpr_functional 201907L [C++2a] - __cpp_lib_constexpr_numeric 201911L [C++2a] - __cpp_lib_constexpr_swap_algorithms 201806L [C++2a] - __cpp_lib_constexpr_utility 201811L [C++2a] - __cpp_lib_destroying_delete 201806L [C++2a] + __cpp_lib_concepts 201806L [C++20] + __cpp_lib_constexpr_dynamic_alloc 201907L [C++20] + __cpp_lib_constexpr_functional 201907L [C++20] + __cpp_lib_constexpr_numeric 201911L [C++20] + __cpp_lib_constexpr_swap_algorithms 201806L [C++20] + __cpp_lib_constexpr_utility 201811L [C++20] + __cpp_lib_destroying_delete 201806L [C++20] __cpp_lib_enable_shared_from_this 201603L [C++17] - __cpp_lib_endian 201907L [C++2a] - __cpp_lib_erase_if 202002L [C++2a] + __cpp_lib_endian 201907L [C++20] + __cpp_lib_erase_if 202002L [C++20] __cpp_lib_exchange_function 201304L [C++14] __cpp_lib_execution 201603L [C++17] __cpp_lib_filesystem 201703L [C++17] __cpp_lib_gcd_lcm 201606L [C++17] __cpp_lib_generic_associative_lookup 201304L [C++14] - __cpp_lib_generic_unordered_lookup 201811L [C++2a] + __cpp_lib_generic_unordered_lookup 201811L [C++20] __cpp_lib_hardware_interference_size 201703L [C++17] __cpp_lib_has_unique_object_representations 201606L [C++17] __cpp_lib_hypot 201603L [C++17] __cpp_lib_incomplete_container_elements 201505L [C++17] - __cpp_lib_int_pow2 202002L [C++2a] + __cpp_lib_int_pow2 202002L [C++20] __cpp_lib_integer_sequence 201304L [C++14] __cpp_lib_integral_constant_callable 201304L [C++14] - __cpp_lib_interpolate 201902L [C++2a] + __cpp_lib_interpolate 201902L [C++20] __cpp_lib_invoke 201411L [C++17] __cpp_lib_is_aggregate 201703L [C++17] - __cpp_lib_is_constant_evaluated 201811L [C++2a] + __cpp_lib_is_constant_evaluated 201811L [C++20] __cpp_lib_is_final 201402L [C++14] __cpp_lib_is_invocable 201703L [C++17] __cpp_lib_is_null_pointer 201309L [C++14] __cpp_lib_is_swappable 201603L [C++17] __cpp_lib_launder 201606L [C++17] - __cpp_lib_list_remove_return_type 201806L [C++2a] + __cpp_lib_list_remove_return_type 201806L [C++20] __cpp_lib_logical_traits 201510L [C++17] __cpp_lib_make_from_tuple 201606L [C++17] __cpp_lib_make_reverse_iterator 201402L [C++14] __cpp_lib_make_unique 201304L [C++14] __cpp_lib_map_try_emplace 201411L [C++17] - __cpp_lib_math_constants 201907L [C++2a] + __cpp_lib_math_constants 201907L [C++20] __cpp_lib_math_special_functions 201603L [C++17] __cpp_lib_memory_resource 201603L [C++17] __cpp_lib_node_extract 201606L [C++17] @@ -87,7 +87,7 @@ __cpp_lib_optional 201606L [C++17] __cpp_lib_parallel_algorithm 201603L [C++17] __cpp_lib_quoted_string_io 201304L [C++14] - __cpp_lib_ranges 201811L [C++2a] + __cpp_lib_ranges 201811L [C++20] __cpp_lib_raw_memory_algorithms 201606L [C++17] __cpp_lib_result_of_sfinae 201210L [C++14] __cpp_lib_robust_nonmodifying_seq_ops 201304L [C++14] @@ -97,11 +97,11 @@ __cpp_lib_shared_ptr_arrays 201611L [C++17] __cpp_lib_shared_ptr_weak_type 201606L [C++17] __cpp_lib_shared_timed_mutex 201402L [C++14] - __cpp_lib_span 202002L [C++2a] + __cpp_lib_span 202002L [C++20] __cpp_lib_string_udls 201304L [C++14] __cpp_lib_string_view 201606L [C++17] - __cpp_lib_three_way_comparison 201711L [C++2a] - __cpp_lib_to_array 201907L [C++2a] + __cpp_lib_three_way_comparison 201711L [C++20] + __cpp_lib_to_array 201907L [C++20] __cpp_lib_to_chars 201611L [C++17] __cpp_lib_transformation_trait_aliases 201304L [C++14] __cpp_lib_transparent_operators 201210L [C++14] @@ -145,11 +145,11 @@ # endif # ifdef __cpp_lib_atomic_flag_test -# error "__cpp_lib_atomic_flag_test should not be defined before c++2a" +# error "__cpp_lib_atomic_flag_test should not be defined before c++20" # endif # ifdef __cpp_lib_atomic_float -# error "__cpp_lib_atomic_float should not be defined before c++2a" +# error "__cpp_lib_atomic_float should not be defined before c++20" # endif # ifdef __cpp_lib_atomic_is_always_lock_free @@ -157,31 +157,31 @@ # endif # ifdef __cpp_lib_atomic_lock_free_type_aliases -# error "__cpp_lib_atomic_lock_free_type_aliases should not be defined before c++2a" +# error "__cpp_lib_atomic_lock_free_type_aliases should not be defined before c++20" # endif # ifdef __cpp_lib_atomic_ref -# error "__cpp_lib_atomic_ref should not be defined before c++2a" +# error "__cpp_lib_atomic_ref should not be defined before c++20" # endif # ifdef __cpp_lib_atomic_shared_ptr -# error "__cpp_lib_atomic_shared_ptr should not be defined before c++2a" +# error "__cpp_lib_atomic_shared_ptr should not be defined before c++20" # endif # ifdef __cpp_lib_atomic_value_initialization -# error "__cpp_lib_atomic_value_initialization should not be defined before c++2a" +# error "__cpp_lib_atomic_value_initialization should not be defined before c++20" # endif # ifdef __cpp_lib_atomic_wait -# error "__cpp_lib_atomic_wait should not be defined before c++2a" +# error "__cpp_lib_atomic_wait should not be defined before c++20" # endif # ifdef __cpp_lib_bind_front -# error "__cpp_lib_bind_front should not be defined before c++2a" +# error "__cpp_lib_bind_front should not be defined before c++20" # endif # ifdef __cpp_lib_bit_cast -# error "__cpp_lib_bit_cast should not be defined before c++2a" +# error "__cpp_lib_bit_cast should not be defined before c++20" # endif # ifdef __cpp_lib_bool_constant @@ -197,7 +197,7 @@ # endif # ifdef __cpp_lib_char8_t -# error "__cpp_lib_char8_t should not be defined before c++2a" +# error "__cpp_lib_char8_t should not be defined before c++20" # endif # ifdef __cpp_lib_chrono @@ -217,31 +217,31 @@ # endif # ifdef __cpp_lib_concepts -# error "__cpp_lib_concepts should not be defined before c++2a" +# error "__cpp_lib_concepts should not be defined before c++20" # endif # ifdef __cpp_lib_constexpr_dynamic_alloc -# error "__cpp_lib_constexpr_dynamic_alloc should not be defined before c++2a" +# error "__cpp_lib_constexpr_dynamic_alloc should not be defined before c++20" # endif # ifdef __cpp_lib_constexpr_functional -# error "__cpp_lib_constexpr_functional should not be defined before c++2a" +# error "__cpp_lib_constexpr_functional should not be defined before c++20" # endif # ifdef __cpp_lib_constexpr_numeric -# error "__cpp_lib_constexpr_numeric should not be defined before c++2a" +# error "__cpp_lib_constexpr_numeric should not be defined before c++20" # endif # ifdef __cpp_lib_constexpr_swap_algorithms -# error "__cpp_lib_constexpr_swap_algorithms should not be defined before c++2a" +# error "__cpp_lib_constexpr_swap_algorithms should not be defined before c++20" # endif # ifdef __cpp_lib_constexpr_utility -# error "__cpp_lib_constexpr_utility should not be defined before c++2a" +# error "__cpp_lib_constexpr_utility should not be defined before c++20" # endif # ifdef __cpp_lib_destroying_delete -# error "__cpp_lib_destroying_delete should not be defined before c++2a" +# error "__cpp_lib_destroying_delete should not be defined before c++20" # endif # ifdef __cpp_lib_enable_shared_from_this @@ -249,11 +249,11 @@ # endif # ifdef __cpp_lib_endian -# error "__cpp_lib_endian should not be defined before c++2a" +# error "__cpp_lib_endian should not be defined before c++20" # endif # ifdef __cpp_lib_erase_if -# error "__cpp_lib_erase_if should not be defined before c++2a" +# error "__cpp_lib_erase_if should not be defined before c++20" # endif # ifdef __cpp_lib_exchange_function @@ -277,7 +277,7 @@ # endif # ifdef __cpp_lib_generic_unordered_lookup -# error "__cpp_lib_generic_unordered_lookup should not be defined before c++2a" +# error "__cpp_lib_generic_unordered_lookup should not be defined before c++20" # endif # ifdef __cpp_lib_hardware_interference_size @@ -297,7 +297,7 @@ # endif # ifdef __cpp_lib_int_pow2 -# error "__cpp_lib_int_pow2 should not be defined before c++2a" +# error "__cpp_lib_int_pow2 should not be defined before c++20" # endif # ifdef __cpp_lib_integer_sequence @@ -309,7 +309,7 @@ # endif # ifdef __cpp_lib_interpolate -# error "__cpp_lib_interpolate should not be defined before c++2a" +# error "__cpp_lib_interpolate should not be defined before c++20" # endif # ifdef __cpp_lib_invoke @@ -321,7 +321,7 @@ # endif # ifdef __cpp_lib_is_constant_evaluated -# error "__cpp_lib_is_constant_evaluated should not be defined before c++2a" +# error "__cpp_lib_is_constant_evaluated should not be defined before c++20" # endif # ifdef __cpp_lib_is_final @@ -345,7 +345,7 @@ # endif # ifdef __cpp_lib_list_remove_return_type -# error "__cpp_lib_list_remove_return_type should not be defined before c++2a" +# error "__cpp_lib_list_remove_return_type should not be defined before c++20" # endif # ifdef __cpp_lib_logical_traits @@ -369,7 +369,7 @@ # endif # ifdef __cpp_lib_math_constants -# error "__cpp_lib_math_constants should not be defined before c++2a" +# error "__cpp_lib_math_constants should not be defined before c++20" # endif # ifdef __cpp_lib_math_special_functions @@ -409,7 +409,7 @@ # endif # ifdef __cpp_lib_ranges -# error "__cpp_lib_ranges should not be defined before c++2a" +# error "__cpp_lib_ranges should not be defined before c++20" # endif # ifdef __cpp_lib_raw_memory_algorithms @@ -449,7 +449,7 @@ # endif # ifdef __cpp_lib_span -# error "__cpp_lib_span should not be defined before c++2a" +# error "__cpp_lib_span should not be defined before c++20" # endif # ifdef __cpp_lib_string_udls @@ -461,11 +461,11 @@ # endif # ifdef __cpp_lib_three_way_comparison -# error "__cpp_lib_three_way_comparison should not be defined before c++2a" +# error "__cpp_lib_three_way_comparison should not be defined before c++20" # endif # ifdef __cpp_lib_to_array -# error "__cpp_lib_to_array should not be defined before c++2a" +# error "__cpp_lib_to_array should not be defined before c++20" # endif # ifdef __cpp_lib_to_chars @@ -535,11 +535,11 @@ # endif # ifdef __cpp_lib_atomic_flag_test -# error "__cpp_lib_atomic_flag_test should not be defined before c++2a" +# error "__cpp_lib_atomic_flag_test should not be defined before c++20" # endif # ifdef __cpp_lib_atomic_float -# error "__cpp_lib_atomic_float should not be defined before c++2a" +# error "__cpp_lib_atomic_float should not be defined before c++20" # endif # ifdef __cpp_lib_atomic_is_always_lock_free @@ -547,31 +547,31 @@ # endif # ifdef __cpp_lib_atomic_lock_free_type_aliases -# error "__cpp_lib_atomic_lock_free_type_aliases should not be defined before c++2a" +# error "__cpp_lib_atomic_lock_free_type_aliases should not be defined before c++20" # endif # ifdef __cpp_lib_atomic_ref -# error "__cpp_lib_atomic_ref should not be defined before c++2a" +# error "__cpp_lib_atomic_ref should not be defined before c++20" # endif # ifdef __cpp_lib_atomic_shared_ptr -# error "__cpp_lib_atomic_shared_ptr should not be defined before c++2a" +# error "__cpp_lib_atomic_shared_ptr should not be defined before c++20" # endif # ifdef __cpp_lib_atomic_value_initialization -# error "__cpp_lib_atomic_value_initialization should not be defined before c++2a" +# error "__cpp_lib_atomic_value_initialization should not be defined before c++20" # endif # ifdef __cpp_lib_atomic_wait -# error "__cpp_lib_atomic_wait should not be defined before c++2a" +# error "__cpp_lib_atomic_wait should not be defined before c++20" # endif # ifdef __cpp_lib_bind_front -# error "__cpp_lib_bind_front should not be defined before c++2a" +# error "__cpp_lib_bind_front should not be defined before c++20" # endif # ifdef __cpp_lib_bit_cast -# error "__cpp_lib_bit_cast should not be defined before c++2a" +# error "__cpp_lib_bit_cast should not be defined before c++20" # endif # ifdef __cpp_lib_bool_constant @@ -587,7 +587,7 @@ # endif # ifdef __cpp_lib_char8_t -# error "__cpp_lib_char8_t should not be defined before c++2a" +# error "__cpp_lib_char8_t should not be defined before c++20" # endif # ifdef __cpp_lib_chrono @@ -613,31 +613,31 @@ # endif # ifdef __cpp_lib_concepts -# error "__cpp_lib_concepts should not be defined before c++2a" +# error "__cpp_lib_concepts should not be defined before c++20" # endif # ifdef __cpp_lib_constexpr_dynamic_alloc -# error "__cpp_lib_constexpr_dynamic_alloc should not be defined before c++2a" +# error "__cpp_lib_constexpr_dynamic_alloc should not be defined before c++20" # endif # ifdef __cpp_lib_constexpr_functional -# error "__cpp_lib_constexpr_functional should not be defined before c++2a" +# error "__cpp_lib_constexpr_functional should not be defined before c++20" # endif # ifdef __cpp_lib_constexpr_numeric -# error "__cpp_lib_constexpr_numeric should not be defined before c++2a" +# error "__cpp_lib_constexpr_numeric should not be defined before c++20" # endif # ifdef __cpp_lib_constexpr_swap_algorithms -# error "__cpp_lib_constexpr_swap_algorithms should not be defined before c++2a" +# error "__cpp_lib_constexpr_swap_algorithms should not be defined before c++20" # endif # ifdef __cpp_lib_constexpr_utility -# error "__cpp_lib_constexpr_utility should not be defined before c++2a" +# error "__cpp_lib_constexpr_utility should not be defined before c++20" # endif # ifdef __cpp_lib_destroying_delete -# error "__cpp_lib_destroying_delete should not be defined before c++2a" +# error "__cpp_lib_destroying_delete should not be defined before c++20" # endif # ifdef __cpp_lib_enable_shared_from_this @@ -645,11 +645,11 @@ # endif # ifdef __cpp_lib_endian -# error "__cpp_lib_endian should not be defined before c++2a" +# error "__cpp_lib_endian should not be defined before c++20" # endif # ifdef __cpp_lib_erase_if -# error "__cpp_lib_erase_if should not be defined before c++2a" +# error "__cpp_lib_erase_if should not be defined before c++20" # endif # ifndef __cpp_lib_exchange_function @@ -679,7 +679,7 @@ # endif # ifdef __cpp_lib_generic_unordered_lookup -# error "__cpp_lib_generic_unordered_lookup should not be defined before c++2a" +# error "__cpp_lib_generic_unordered_lookup should not be defined before c++20" # endif # ifdef __cpp_lib_hardware_interference_size @@ -699,7 +699,7 @@ # endif # ifdef __cpp_lib_int_pow2 -# error "__cpp_lib_int_pow2 should not be defined before c++2a" +# error "__cpp_lib_int_pow2 should not be defined before c++20" # endif # ifndef __cpp_lib_integer_sequence @@ -717,7 +717,7 @@ # endif # ifdef __cpp_lib_interpolate -# error "__cpp_lib_interpolate should not be defined before c++2a" +# error "__cpp_lib_interpolate should not be defined before c++20" # endif # ifdef __cpp_lib_invoke @@ -729,7 +729,7 @@ # endif # ifdef __cpp_lib_is_constant_evaluated -# error "__cpp_lib_is_constant_evaluated should not be defined before c++2a" +# error "__cpp_lib_is_constant_evaluated should not be defined before c++20" # endif # ifndef __cpp_lib_is_final @@ -759,7 +759,7 @@ # endif # ifdef __cpp_lib_list_remove_return_type -# error "__cpp_lib_list_remove_return_type should not be defined before c++2a" +# error "__cpp_lib_list_remove_return_type should not be defined before c++20" # endif # ifdef __cpp_lib_logical_traits @@ -789,7 +789,7 @@ # endif # ifdef __cpp_lib_math_constants -# error "__cpp_lib_math_constants should not be defined before c++2a" +# error "__cpp_lib_math_constants should not be defined before c++20" # endif # ifdef __cpp_lib_math_special_functions @@ -835,7 +835,7 @@ # endif # ifdef __cpp_lib_ranges -# error "__cpp_lib_ranges should not be defined before c++2a" +# error "__cpp_lib_ranges should not be defined before c++20" # endif # ifdef __cpp_lib_raw_memory_algorithms @@ -890,7 +890,7 @@ # endif # ifdef __cpp_lib_span -# error "__cpp_lib_span should not be defined before c++2a" +# error "__cpp_lib_span should not be defined before c++20" # endif # ifndef __cpp_lib_string_udls @@ -905,11 +905,11 @@ # endif # ifdef __cpp_lib_three_way_comparison -# error "__cpp_lib_three_way_comparison should not be defined before c++2a" +# error "__cpp_lib_three_way_comparison should not be defined before c++20" # endif # ifdef __cpp_lib_to_array -# error "__cpp_lib_to_array should not be defined before c++2a" +# error "__cpp_lib_to_array should not be defined before c++20" # endif # ifdef __cpp_lib_to_chars @@ -1015,11 +1015,11 @@ # endif # ifdef __cpp_lib_atomic_flag_test -# error "__cpp_lib_atomic_flag_test should not be defined before c++2a" +# error "__cpp_lib_atomic_flag_test should not be defined before c++20" # endif # ifdef __cpp_lib_atomic_float -# error "__cpp_lib_atomic_float should not be defined before c++2a" +# error "__cpp_lib_atomic_float should not be defined before c++20" # endif # if !defined(_LIBCPP_HAS_NO_THREADS) @@ -1036,31 +1036,31 @@ # endif # ifdef __cpp_lib_atomic_lock_free_type_aliases -# error "__cpp_lib_atomic_lock_free_type_aliases should not be defined before c++2a" +# error "__cpp_lib_atomic_lock_free_type_aliases should not be defined before c++20" # endif # ifdef __cpp_lib_atomic_ref -# error "__cpp_lib_atomic_ref should not be defined before c++2a" +# error "__cpp_lib_atomic_ref should not be defined before c++20" # endif # ifdef __cpp_lib_atomic_shared_ptr -# error "__cpp_lib_atomic_shared_ptr should not be defined before c++2a" +# error "__cpp_lib_atomic_shared_ptr should not be defined before c++20" # endif # ifdef __cpp_lib_atomic_value_initialization -# error "__cpp_lib_atomic_value_initialization should not be defined before c++2a" +# error "__cpp_lib_atomic_value_initialization should not be defined before c++20" # endif # ifdef __cpp_lib_atomic_wait -# error "__cpp_lib_atomic_wait should not be defined before c++2a" +# error "__cpp_lib_atomic_wait should not be defined before c++20" # endif # ifdef __cpp_lib_bind_front -# error "__cpp_lib_bind_front should not be defined before c++2a" +# error "__cpp_lib_bind_front should not be defined before c++20" # endif # ifdef __cpp_lib_bit_cast -# error "__cpp_lib_bit_cast should not be defined before c++2a" +# error "__cpp_lib_bit_cast should not be defined before c++20" # endif # ifndef __cpp_lib_bool_constant @@ -1091,7 +1091,7 @@ # endif # ifdef __cpp_lib_char8_t -# error "__cpp_lib_char8_t should not be defined before c++2a" +# error "__cpp_lib_char8_t should not be defined before c++20" # endif # ifndef __cpp_lib_chrono @@ -1123,31 +1123,31 @@ # endif # ifdef __cpp_lib_concepts -# error "__cpp_lib_concepts should not be defined before c++2a" +# error "__cpp_lib_concepts should not be defined before c++20" # endif # ifdef __cpp_lib_constexpr_dynamic_alloc -# error "__cpp_lib_constexpr_dynamic_alloc should not be defined before c++2a" +# error "__cpp_lib_constexpr_dynamic_alloc should not be defined before c++20" # endif # ifdef __cpp_lib_constexpr_functional -# error "__cpp_lib_constexpr_functional should not be defined before c++2a" +# error "__cpp_lib_constexpr_functional should not be defined before c++20" # endif # ifdef __cpp_lib_constexpr_numeric -# error "__cpp_lib_constexpr_numeric should not be defined before c++2a" +# error "__cpp_lib_constexpr_numeric should not be defined before c++20" # endif # ifdef __cpp_lib_constexpr_swap_algorithms -# error "__cpp_lib_constexpr_swap_algorithms should not be defined before c++2a" +# error "__cpp_lib_constexpr_swap_algorithms should not be defined before c++20" # endif # ifdef __cpp_lib_constexpr_utility -# error "__cpp_lib_constexpr_utility should not be defined before c++2a" +# error "__cpp_lib_constexpr_utility should not be defined before c++20" # endif # ifdef __cpp_lib_destroying_delete -# error "__cpp_lib_destroying_delete should not be defined before c++2a" +# error "__cpp_lib_destroying_delete should not be defined before c++20" # endif # ifndef __cpp_lib_enable_shared_from_this @@ -1158,11 +1158,11 @@ # endif # ifdef __cpp_lib_endian -# error "__cpp_lib_endian should not be defined before c++2a" +# error "__cpp_lib_endian should not be defined before c++20" # endif # ifdef __cpp_lib_erase_if -# error "__cpp_lib_erase_if should not be defined before c++2a" +# error "__cpp_lib_erase_if should not be defined before c++20" # endif # ifndef __cpp_lib_exchange_function @@ -1207,7 +1207,7 @@ # endif # ifdef __cpp_lib_generic_unordered_lookup -# error "__cpp_lib_generic_unordered_lookup should not be defined before c++2a" +# error "__cpp_lib_generic_unordered_lookup should not be defined before c++20" # endif # if !defined(_LIBCPP_VERSION) @@ -1251,7 +1251,7 @@ # endif # ifdef __cpp_lib_int_pow2 -# error "__cpp_lib_int_pow2 should not be defined before c++2a" +# error "__cpp_lib_int_pow2 should not be defined before c++20" # endif # ifndef __cpp_lib_integer_sequence @@ -1269,7 +1269,7 @@ # endif # ifdef __cpp_lib_interpolate -# error "__cpp_lib_interpolate should not be defined before c++2a" +# error "__cpp_lib_interpolate should not be defined before c++20" # endif # ifndef __cpp_lib_invoke @@ -1293,7 +1293,7 @@ # endif # ifdef __cpp_lib_is_constant_evaluated -# error "__cpp_lib_is_constant_evaluated should not be defined before c++2a" +# error "__cpp_lib_is_constant_evaluated should not be defined before c++20" # endif # ifndef __cpp_lib_is_final @@ -1332,7 +1332,7 @@ # endif # ifdef __cpp_lib_list_remove_return_type -# error "__cpp_lib_list_remove_return_type should not be defined before c++2a" +# error "__cpp_lib_list_remove_return_type should not be defined before c++20" # endif # ifndef __cpp_lib_logical_traits @@ -1371,7 +1371,7 @@ # endif # ifdef __cpp_lib_math_constants -# error "__cpp_lib_math_constants should not be defined before c++2a" +# error "__cpp_lib_math_constants should not be defined before c++20" # endif # if !defined(_LIBCPP_VERSION) @@ -1456,7 +1456,7 @@ # endif # ifdef __cpp_lib_ranges -# error "__cpp_lib_ranges should not be defined before c++2a" +# error "__cpp_lib_ranges should not be defined before c++20" # endif # ifndef __cpp_lib_raw_memory_algorithms @@ -1535,7 +1535,7 @@ # endif # ifdef __cpp_lib_span -# error "__cpp_lib_span should not be defined before c++2a" +# error "__cpp_lib_span should not be defined before c++20" # endif # ifndef __cpp_lib_string_udls @@ -1553,11 +1553,11 @@ # endif # ifdef __cpp_lib_three_way_comparison -# error "__cpp_lib_three_way_comparison should not be defined before c++2a" +# error "__cpp_lib_three_way_comparison should not be defined before c++20" # endif # ifdef __cpp_lib_to_array -# error "__cpp_lib_to_array should not be defined before c++2a" +# error "__cpp_lib_to_array should not be defined before c++20" # endif # if !defined(_LIBCPP_VERSION) @@ -1636,14 +1636,14 @@ # error "__cpp_lib_void_t should have the value 201411L in c++17" # endif -#elif TEST_STD_VER > 17 +#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++2a" +# error "__cpp_lib_addressof_constexpr should be defined in c++20" # endif # if __cpp_lib_addressof_constexpr != 201603L -# error "__cpp_lib_addressof_constexpr should have the value 201603L in c++2a" +# error "__cpp_lib_addressof_constexpr should have the value 201603L in c++20" # endif # else # ifdef __cpp_lib_addressof_constexpr @@ -1652,46 +1652,46 @@ # endif # ifndef __cpp_lib_allocator_traits_is_always_equal -# error "__cpp_lib_allocator_traits_is_always_equal should be defined in c++2a" +# error "__cpp_lib_allocator_traits_is_always_equal should be defined in c++20" # 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++2a" +# error "__cpp_lib_allocator_traits_is_always_equal should have the value 201411L in c++20" # endif # ifndef __cpp_lib_any -# error "__cpp_lib_any should be defined in c++2a" +# error "__cpp_lib_any should be defined in c++20" # endif # if __cpp_lib_any != 201606L -# error "__cpp_lib_any should have the value 201606L in c++2a" +# error "__cpp_lib_any should have the value 201606L in c++20" # endif # ifndef __cpp_lib_apply -# error "__cpp_lib_apply should be defined in c++2a" +# error "__cpp_lib_apply should be defined in c++20" # endif # if __cpp_lib_apply != 201603L -# error "__cpp_lib_apply should have the value 201603L in c++2a" +# error "__cpp_lib_apply should have the value 201603L in c++20" # endif # ifndef __cpp_lib_array_constexpr -# error "__cpp_lib_array_constexpr should be defined in c++2a" +# error "__cpp_lib_array_constexpr should be defined in c++20" # endif # if __cpp_lib_array_constexpr != 201811L -# error "__cpp_lib_array_constexpr should have the value 201811L in c++2a" +# error "__cpp_lib_array_constexpr should have the value 201811L in c++20" # endif # ifndef __cpp_lib_as_const -# error "__cpp_lib_as_const should be defined in c++2a" +# error "__cpp_lib_as_const should be defined in c++20" # endif # if __cpp_lib_as_const != 201510L -# error "__cpp_lib_as_const should have the value 201510L in c++2a" +# error "__cpp_lib_as_const should have the value 201510L in c++20" # endif # if !defined(_LIBCPP_HAS_NO_THREADS) # ifndef __cpp_lib_atomic_flag_test -# error "__cpp_lib_atomic_flag_test should be defined in c++2a" +# error "__cpp_lib_atomic_flag_test should be defined in c++20" # endif # if __cpp_lib_atomic_flag_test != 201907L -# error "__cpp_lib_atomic_flag_test should have the value 201907L in c++2a" +# error "__cpp_lib_atomic_flag_test should have the value 201907L in c++20" # endif # else # ifdef __cpp_lib_atomic_flag_test @@ -1701,10 +1701,10 @@ # if !defined(_LIBCPP_VERSION) # ifndef __cpp_lib_atomic_float -# error "__cpp_lib_atomic_float should be defined in c++2a" +# error "__cpp_lib_atomic_float should be defined in c++20" # endif # if __cpp_lib_atomic_float != 201711L -# error "__cpp_lib_atomic_float should have the value 201711L in c++2a" +# error "__cpp_lib_atomic_float should have the value 201711L in c++20" # endif # else // _LIBCPP_VERSION # ifdef __cpp_lib_atomic_float @@ -1714,10 +1714,10 @@ # 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++2a" +# error "__cpp_lib_atomic_is_always_lock_free should be defined in c++20" # 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++2a" +# error "__cpp_lib_atomic_is_always_lock_free should have the value 201603L in c++20" # endif # else # ifdef __cpp_lib_atomic_is_always_lock_free @@ -1727,10 +1727,10 @@ # 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++2a" +# error "__cpp_lib_atomic_lock_free_type_aliases should be defined in c++20" # 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++2a" +# error "__cpp_lib_atomic_lock_free_type_aliases should have the value 201907L in c++20" # endif # else # ifdef __cpp_lib_atomic_lock_free_type_aliases @@ -1740,10 +1740,10 @@ # if !defined(_LIBCPP_VERSION) # ifndef __cpp_lib_atomic_ref -# error "__cpp_lib_atomic_ref should be defined in c++2a" +# error "__cpp_lib_atomic_ref should be defined in c++20" # endif # if __cpp_lib_atomic_ref != 201806L -# error "__cpp_lib_atomic_ref should have the value 201806L in c++2a" +# error "__cpp_lib_atomic_ref should have the value 201806L in c++20" # endif # else // _LIBCPP_VERSION # ifdef __cpp_lib_atomic_ref @@ -1753,10 +1753,10 @@ # if !defined(_LIBCPP_VERSION) # ifndef __cpp_lib_atomic_shared_ptr -# error "__cpp_lib_atomic_shared_ptr should be defined in c++2a" +# error "__cpp_lib_atomic_shared_ptr should be defined in c++20" # endif # if __cpp_lib_atomic_shared_ptr != 201711L -# error "__cpp_lib_atomic_shared_ptr should have the value 201711L in c++2a" +# error "__cpp_lib_atomic_shared_ptr should have the value 201711L in c++20" # endif # else // _LIBCPP_VERSION # ifdef __cpp_lib_atomic_shared_ptr @@ -1766,10 +1766,10 @@ # if !defined(_LIBCPP_VERSION) # ifndef __cpp_lib_atomic_value_initialization -# error "__cpp_lib_atomic_value_initialization should be defined in c++2a" +# error "__cpp_lib_atomic_value_initialization should be defined in c++20" # endif # if __cpp_lib_atomic_value_initialization != 201911L -# error "__cpp_lib_atomic_value_initialization should have the value 201911L in c++2a" +# error "__cpp_lib_atomic_value_initialization should have the value 201911L in c++20" # endif # else // _LIBCPP_VERSION # ifdef __cpp_lib_atomic_value_initialization @@ -1779,10 +1779,10 @@ # if !defined(_LIBCPP_HAS_NO_THREADS) # ifndef __cpp_lib_atomic_wait -# error "__cpp_lib_atomic_wait should be defined in c++2a" +# error "__cpp_lib_atomic_wait should be defined in c++20" # endif # if __cpp_lib_atomic_wait != 201907L -# error "__cpp_lib_atomic_wait should have the value 201907L in c++2a" +# error "__cpp_lib_atomic_wait should have the value 201907L in c++20" # endif # else # ifdef __cpp_lib_atomic_wait @@ -1792,10 +1792,10 @@ # if !defined(_LIBCPP_VERSION) # ifndef __cpp_lib_bind_front -# error "__cpp_lib_bind_front should be defined in c++2a" +# error "__cpp_lib_bind_front should be defined in c++20" # endif # if __cpp_lib_bind_front != 201811L -# error "__cpp_lib_bind_front should have the value 201811L in c++2a" +# error "__cpp_lib_bind_front should have the value 201811L in c++20" # endif # else // _LIBCPP_VERSION # ifdef __cpp_lib_bind_front @@ -1805,10 +1805,10 @@ # if !defined(_LIBCPP_VERSION) # ifndef __cpp_lib_bit_cast -# error "__cpp_lib_bit_cast should be defined in c++2a" +# error "__cpp_lib_bit_cast should be defined in c++20" # endif # if __cpp_lib_bit_cast != 201806L -# error "__cpp_lib_bit_cast should have the value 201806L in c++2a" +# error "__cpp_lib_bit_cast should have the value 201806L in c++20" # endif # else // _LIBCPP_VERSION # ifdef __cpp_lib_bit_cast @@ -1817,18 +1817,18 @@ # endif # ifndef __cpp_lib_bool_constant -# error "__cpp_lib_bool_constant should be defined in c++2a" +# error "__cpp_lib_bool_constant should be defined in c++20" # endif # if __cpp_lib_bool_constant != 201505L -# error "__cpp_lib_bool_constant should have the value 201505L in c++2a" +# error "__cpp_lib_bool_constant should have the value 201505L in c++20" # endif # if !defined(_LIBCPP_VERSION) # ifndef __cpp_lib_boyer_moore_searcher -# error "__cpp_lib_boyer_moore_searcher should be defined in c++2a" +# error "__cpp_lib_boyer_moore_searcher should be defined in c++20" # endif # if __cpp_lib_boyer_moore_searcher != 201603L -# error "__cpp_lib_boyer_moore_searcher should have the value 201603L in c++2a" +# error "__cpp_lib_boyer_moore_searcher should have the value 201603L in c++20" # endif # else // _LIBCPP_VERSION # ifdef __cpp_lib_boyer_moore_searcher @@ -1837,18 +1837,18 @@ # endif # ifndef __cpp_lib_byte -# error "__cpp_lib_byte should be defined in c++2a" +# error "__cpp_lib_byte should be defined in c++20" # endif # if __cpp_lib_byte != 201603L -# error "__cpp_lib_byte should have the value 201603L in c++2a" +# error "__cpp_lib_byte should have the value 201603L in c++20" # endif # if defined(__cpp_char8_t) # ifndef __cpp_lib_char8_t -# error "__cpp_lib_char8_t should be defined in c++2a" +# error "__cpp_lib_char8_t should be defined in c++20" # endif # if __cpp_lib_char8_t != 201811L -# error "__cpp_lib_char8_t should have the value 201811L in c++2a" +# error "__cpp_lib_char8_t should have the value 201811L in c++20" # endif # else # ifdef __cpp_lib_char8_t @@ -1857,39 +1857,39 @@ # endif # ifndef __cpp_lib_chrono -# error "__cpp_lib_chrono should be defined in c++2a" +# error "__cpp_lib_chrono should be defined in c++20" # endif # if __cpp_lib_chrono != 201611L -# error "__cpp_lib_chrono should have the value 201611L in c++2a" +# error "__cpp_lib_chrono should have the value 201611L in c++20" # endif # ifndef __cpp_lib_chrono_udls -# error "__cpp_lib_chrono_udls should be defined in c++2a" +# error "__cpp_lib_chrono_udls should be defined in c++20" # endif # if __cpp_lib_chrono_udls != 201304L -# error "__cpp_lib_chrono_udls should have the value 201304L in c++2a" +# error "__cpp_lib_chrono_udls should have the value 201304L in c++20" # endif # ifndef __cpp_lib_clamp -# error "__cpp_lib_clamp should be defined in c++2a" +# error "__cpp_lib_clamp should be defined in c++20" # endif # if __cpp_lib_clamp != 201603L -# error "__cpp_lib_clamp should have the value 201603L in c++2a" +# error "__cpp_lib_clamp should have the value 201603L in c++20" # endif # ifndef __cpp_lib_complex_udls -# error "__cpp_lib_complex_udls should be defined in c++2a" +# error "__cpp_lib_complex_udls should be defined in c++20" # endif # if __cpp_lib_complex_udls != 201309L -# error "__cpp_lib_complex_udls should have the value 201309L in c++2a" +# error "__cpp_lib_complex_udls should have the value 201309L in c++20" # endif # if !defined(_LIBCPP_VERSION) # ifndef __cpp_lib_concepts -# error "__cpp_lib_concepts should be defined in c++2a" +# error "__cpp_lib_concepts should be defined in c++20" # endif # if __cpp_lib_concepts != 201806L -# error "__cpp_lib_concepts should have the value 201806L in c++2a" +# error "__cpp_lib_concepts should have the value 201806L in c++20" # endif # else // _LIBCPP_VERSION # ifdef __cpp_lib_concepts @@ -1898,32 +1898,32 @@ # endif # ifndef __cpp_lib_constexpr_dynamic_alloc -# error "__cpp_lib_constexpr_dynamic_alloc should be defined in c++2a" +# error "__cpp_lib_constexpr_dynamic_alloc should be defined in c++20" # endif # if __cpp_lib_constexpr_dynamic_alloc != 201907L -# error "__cpp_lib_constexpr_dynamic_alloc should have the value 201907L in c++2a" +# error "__cpp_lib_constexpr_dynamic_alloc should have the value 201907L in c++20" # endif # ifndef __cpp_lib_constexpr_functional -# error "__cpp_lib_constexpr_functional should be defined in c++2a" +# error "__cpp_lib_constexpr_functional should be defined in c++20" # endif # if __cpp_lib_constexpr_functional != 201907L -# error "__cpp_lib_constexpr_functional should have the value 201907L in c++2a" +# error "__cpp_lib_constexpr_functional should have the value 201907L in c++20" # endif # ifndef __cpp_lib_constexpr_numeric -# error "__cpp_lib_constexpr_numeric should be defined in c++2a" +# error "__cpp_lib_constexpr_numeric should be defined in c++20" # endif # if __cpp_lib_constexpr_numeric != 201911L -# error "__cpp_lib_constexpr_numeric should have the value 201911L in c++2a" +# error "__cpp_lib_constexpr_numeric should have the value 201911L in c++20" # endif # if !defined(_LIBCPP_VERSION) # ifndef __cpp_lib_constexpr_swap_algorithms -# error "__cpp_lib_constexpr_swap_algorithms should be defined in c++2a" +# error "__cpp_lib_constexpr_swap_algorithms should be defined in c++20" # endif # if __cpp_lib_constexpr_swap_algorithms != 201806L -# error "__cpp_lib_constexpr_swap_algorithms should have the value 201806L in c++2a" +# error "__cpp_lib_constexpr_swap_algorithms should have the value 201806L in c++20" # endif # else // _LIBCPP_VERSION # ifdef __cpp_lib_constexpr_swap_algorithms @@ -1932,18 +1932,18 @@ # endif # ifndef __cpp_lib_constexpr_utility -# error "__cpp_lib_constexpr_utility should be defined in c++2a" +# error "__cpp_lib_constexpr_utility should be defined in c++20" # endif # if __cpp_lib_constexpr_utility != 201811L -# error "__cpp_lib_constexpr_utility should have the value 201811L in c++2a" +# error "__cpp_lib_constexpr_utility should have the value 201811L in c++20" # 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++2a" +# error "__cpp_lib_destroying_delete should be defined in c++20" # endif # if __cpp_lib_destroying_delete != 201806L -# error "__cpp_lib_destroying_delete should have the value 201806L in c++2a" +# error "__cpp_lib_destroying_delete should have the value 201806L in c++20" # endif # else # ifdef __cpp_lib_destroying_delete @@ -1952,39 +1952,39 @@ # endif # ifndef __cpp_lib_enable_shared_from_this -# error "__cpp_lib_enable_shared_from_this should be defined in c++2a" +# error "__cpp_lib_enable_shared_from_this should be defined in c++20" # endif # if __cpp_lib_enable_shared_from_this != 201603L -# error "__cpp_lib_enable_shared_from_this should have the value 201603L in c++2a" +# error "__cpp_lib_enable_shared_from_this should have the value 201603L in c++20" # endif # ifndef __cpp_lib_endian -# error "__cpp_lib_endian should be defined in c++2a" +# error "__cpp_lib_endian should be defined in c++20" # endif # if __cpp_lib_endian != 201907L -# error "__cpp_lib_endian should have the value 201907L in c++2a" +# error "__cpp_lib_endian should have the value 201907L in c++20" # endif # ifndef __cpp_lib_erase_if -# error "__cpp_lib_erase_if should be defined in c++2a" +# error "__cpp_lib_erase_if should be defined in c++20" # endif # if __cpp_lib_erase_if != 202002L -# error "__cpp_lib_erase_if should have the value 202002L in c++2a" +# error "__cpp_lib_erase_if should have the value 202002L in c++20" # endif # ifndef __cpp_lib_exchange_function -# error "__cpp_lib_exchange_function should be defined in c++2a" +# error "__cpp_lib_exchange_function should be defined in c++20" # endif # if __cpp_lib_exchange_function != 201304L -# error "__cpp_lib_exchange_function should have the value 201304L in c++2a" +# error "__cpp_lib_exchange_function should have the value 201304L in c++20" # endif # if !defined(_LIBCPP_VERSION) # ifndef __cpp_lib_execution -# error "__cpp_lib_execution should be defined in c++2a" +# error "__cpp_lib_execution should be defined in c++20" # endif # if __cpp_lib_execution != 201603L -# error "__cpp_lib_execution should have the value 201603L in c++2a" +# error "__cpp_lib_execution should have the value 201603L in c++20" # endif # else // _LIBCPP_VERSION # ifdef __cpp_lib_execution @@ -1993,39 +1993,39 @@ # endif # ifndef __cpp_lib_filesystem -# error "__cpp_lib_filesystem should be defined in c++2a" +# error "__cpp_lib_filesystem should be defined in c++20" # endif # if __cpp_lib_filesystem != 201703L -# error "__cpp_lib_filesystem should have the value 201703L in c++2a" +# error "__cpp_lib_filesystem should have the value 201703L in c++20" # endif # ifndef __cpp_lib_gcd_lcm -# error "__cpp_lib_gcd_lcm should be defined in c++2a" +# error "__cpp_lib_gcd_lcm should be defined in c++20" # endif # if __cpp_lib_gcd_lcm != 201606L -# error "__cpp_lib_gcd_lcm should have the value 201606L in c++2a" +# error "__cpp_lib_gcd_lcm should have the value 201606L in c++20" # endif # ifndef __cpp_lib_generic_associative_lookup -# error "__cpp_lib_generic_associative_lookup should be defined in c++2a" +# error "__cpp_lib_generic_associative_lookup should be defined in c++20" # endif # if __cpp_lib_generic_associative_lookup != 201304L -# error "__cpp_lib_generic_associative_lookup should have the value 201304L in c++2a" +# error "__cpp_lib_generic_associative_lookup should have the value 201304L in c++20" # endif # ifndef __cpp_lib_generic_unordered_lookup -# error "__cpp_lib_generic_unordered_lookup should be defined in c++2a" +# error "__cpp_lib_generic_unordered_lookup should be defined in c++20" # endif # if __cpp_lib_generic_unordered_lookup != 201811L -# error "__cpp_lib_generic_unordered_lookup should have the value 201811L in c++2a" +# error "__cpp_lib_generic_unordered_lookup should have the value 201811L in c++20" # endif # if !defined(_LIBCPP_VERSION) # ifndef __cpp_lib_hardware_interference_size -# error "__cpp_lib_hardware_interference_size should be defined in c++2a" +# error "__cpp_lib_hardware_interference_size should be defined in c++20" # endif # if __cpp_lib_hardware_interference_size != 201703L -# error "__cpp_lib_hardware_interference_size should have the value 201703L in c++2a" +# error "__cpp_lib_hardware_interference_size should have the value 201703L in c++20" # endif # else // _LIBCPP_VERSION # ifdef __cpp_lib_hardware_interference_size @@ -2035,10 +2035,10 @@ # 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++2a" +# error "__cpp_lib_has_unique_object_representations should be defined in c++20" # endif # if __cpp_lib_has_unique_object_representations != 201606L -# error "__cpp_lib_has_unique_object_representations should have the value 201606L in c++2a" +# error "__cpp_lib_has_unique_object_representations should have the value 201606L in c++20" # endif # else # ifdef __cpp_lib_has_unique_object_representations @@ -2047,60 +2047,60 @@ # endif # ifndef __cpp_lib_hypot -# error "__cpp_lib_hypot should be defined in c++2a" +# error "__cpp_lib_hypot should be defined in c++20" # endif # if __cpp_lib_hypot != 201603L -# error "__cpp_lib_hypot should have the value 201603L in c++2a" +# error "__cpp_lib_hypot should have the value 201603L in c++20" # endif # ifndef __cpp_lib_incomplete_container_elements -# error "__cpp_lib_incomplete_container_elements should be defined in c++2a" +# error "__cpp_lib_incomplete_container_elements should be defined in c++20" # endif # if __cpp_lib_incomplete_container_elements != 201505L -# error "__cpp_lib_incomplete_container_elements should have the value 201505L in c++2a" +# error "__cpp_lib_incomplete_container_elements should have the value 201505L in c++20" # endif # ifndef __cpp_lib_int_pow2 -# error "__cpp_lib_int_pow2 should be defined in c++2a" +# error "__cpp_lib_int_pow2 should be defined in c++20" # endif # if __cpp_lib_int_pow2 != 202002L -# error "__cpp_lib_int_pow2 should have the value 202002L in c++2a" +# error "__cpp_lib_int_pow2 should have the value 202002L in c++20" # endif # ifndef __cpp_lib_integer_sequence -# error "__cpp_lib_integer_sequence should be defined in c++2a" +# error "__cpp_lib_integer_sequence should be defined in c++20" # endif # if __cpp_lib_integer_sequence != 201304L -# error "__cpp_lib_integer_sequence should have the value 201304L in c++2a" +# error "__cpp_lib_integer_sequence should have the value 201304L in c++20" # endif # ifndef __cpp_lib_integral_constant_callable -# error "__cpp_lib_integral_constant_callable should be defined in c++2a" +# error "__cpp_lib_integral_constant_callable should be defined in c++20" # endif # if __cpp_lib_integral_constant_callable != 201304L -# error "__cpp_lib_integral_constant_callable should have the value 201304L in c++2a" +# error "__cpp_lib_integral_constant_callable should have the value 201304L in c++20" # endif # ifndef __cpp_lib_interpolate -# error "__cpp_lib_interpolate should be defined in c++2a" +# error "__cpp_lib_interpolate should be defined in c++20" # endif # if __cpp_lib_interpolate != 201902L -# error "__cpp_lib_interpolate should have the value 201902L in c++2a" +# error "__cpp_lib_interpolate should have the value 201902L in c++20" # endif # ifndef __cpp_lib_invoke -# error "__cpp_lib_invoke should be defined in c++2a" +# error "__cpp_lib_invoke should be defined in c++20" # endif # if __cpp_lib_invoke != 201411L -# error "__cpp_lib_invoke should have the value 201411L in c++2a" +# error "__cpp_lib_invoke should have the value 201411L in c++20" # 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++2a" +# error "__cpp_lib_is_aggregate should be defined in c++20" # endif # if __cpp_lib_is_aggregate != 201703L -# error "__cpp_lib_is_aggregate should have the value 201703L in c++2a" +# error "__cpp_lib_is_aggregate should have the value 201703L in c++20" # endif # else # ifdef __cpp_lib_is_aggregate @@ -2110,10 +2110,10 @@ # 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++2a" +# error "__cpp_lib_is_constant_evaluated should be defined in c++20" # endif # if __cpp_lib_is_constant_evaluated != 201811L -# error "__cpp_lib_is_constant_evaluated should have the value 201811L in c++2a" +# error "__cpp_lib_is_constant_evaluated should have the value 201811L in c++20" # endif # else # ifdef __cpp_lib_is_constant_evaluated @@ -2122,88 +2122,88 @@ # endif # ifndef __cpp_lib_is_final -# error "__cpp_lib_is_final should be defined in c++2a" +# error "__cpp_lib_is_final should be defined in c++20" # endif # if __cpp_lib_is_final != 201402L -# error "__cpp_lib_is_final should have the value 201402L in c++2a" +# error "__cpp_lib_is_final should have the value 201402L in c++20" # endif # ifndef __cpp_lib_is_invocable -# error "__cpp_lib_is_invocable should be defined in c++2a" +# error "__cpp_lib_is_invocable should be defined in c++20" # endif # if __cpp_lib_is_invocable != 201703L -# error "__cpp_lib_is_invocable should have the value 201703L in c++2a" +# error "__cpp_lib_is_invocable should have the value 201703L in c++20" # endif # ifndef __cpp_lib_is_null_pointer -# error "__cpp_lib_is_null_pointer should be defined in c++2a" +# error "__cpp_lib_is_null_pointer should be defined in c++20" # endif # if __cpp_lib_is_null_pointer != 201309L -# error "__cpp_lib_is_null_pointer should have the value 201309L in c++2a" +# error "__cpp_lib_is_null_pointer should have the value 201309L in c++20" # endif # ifndef __cpp_lib_is_swappable -# error "__cpp_lib_is_swappable should be defined in c++2a" +# error "__cpp_lib_is_swappable should be defined in c++20" # endif # if __cpp_lib_is_swappable != 201603L -# error "__cpp_lib_is_swappable should have the value 201603L in c++2a" +# error "__cpp_lib_is_swappable should have the value 201603L in c++20" # endif # ifndef __cpp_lib_launder -# error "__cpp_lib_launder should be defined in c++2a" +# error "__cpp_lib_launder should be defined in c++20" # endif # if __cpp_lib_launder != 201606L -# error "__cpp_lib_launder should have the value 201606L in c++2a" +# error "__cpp_lib_launder should have the value 201606L in c++20" # endif # ifndef __cpp_lib_list_remove_return_type -# error "__cpp_lib_list_remove_return_type should be defined in c++2a" +# error "__cpp_lib_list_remove_return_type should be defined in c++20" # endif # if __cpp_lib_list_remove_return_type != 201806L -# error "__cpp_lib_list_remove_return_type should have the value 201806L in c++2a" +# error "__cpp_lib_list_remove_return_type should have the value 201806L in c++20" # endif # ifndef __cpp_lib_logical_traits -# error "__cpp_lib_logical_traits should be defined in c++2a" +# error "__cpp_lib_logical_traits should be defined in c++20" # endif # if __cpp_lib_logical_traits != 201510L -# error "__cpp_lib_logical_traits should have the value 201510L in c++2a" +# error "__cpp_lib_logical_traits should have the value 201510L in c++20" # endif # ifndef __cpp_lib_make_from_tuple -# error "__cpp_lib_make_from_tuple should be defined in c++2a" +# error "__cpp_lib_make_from_tuple should be defined in c++20" # endif # if __cpp_lib_make_from_tuple != 201606L -# error "__cpp_lib_make_from_tuple should have the value 201606L in c++2a" +# error "__cpp_lib_make_from_tuple should have the value 201606L in c++20" # endif # ifndef __cpp_lib_make_reverse_iterator -# error "__cpp_lib_make_reverse_iterator should be defined in c++2a" +# error "__cpp_lib_make_reverse_iterator should be defined in c++20" # endif # if __cpp_lib_make_reverse_iterator != 201402L -# error "__cpp_lib_make_reverse_iterator should have the value 201402L in c++2a" +# error "__cpp_lib_make_reverse_iterator should have the value 201402L in c++20" # endif # ifndef __cpp_lib_make_unique -# error "__cpp_lib_make_unique should be defined in c++2a" +# error "__cpp_lib_make_unique should be defined in c++20" # endif # if __cpp_lib_make_unique != 201304L -# error "__cpp_lib_make_unique should have the value 201304L in c++2a" +# error "__cpp_lib_make_unique should have the value 201304L in c++20" # endif # ifndef __cpp_lib_map_try_emplace -# error "__cpp_lib_map_try_emplace should be defined in c++2a" +# error "__cpp_lib_map_try_emplace should be defined in c++20" # endif # if __cpp_lib_map_try_emplace != 201411L -# error "__cpp_lib_map_try_emplace should have the value 201411L in c++2a" +# error "__cpp_lib_map_try_emplace should have the value 201411L in c++20" # endif # if defined(__cpp_concepts) && __cpp_concepts >= 201811L # ifndef __cpp_lib_math_constants -# error "__cpp_lib_math_constants should be defined in c++2a" +# error "__cpp_lib_math_constants should be defined in c++20" # endif # if __cpp_lib_math_constants != 201907L -# error "__cpp_lib_math_constants should have the value 201907L in c++2a" +# error "__cpp_lib_math_constants should have the value 201907L in c++20" # endif # else # ifdef __cpp_lib_math_constants @@ -2213,10 +2213,10 @@ # if !defined(_LIBCPP_VERSION) # ifndef __cpp_lib_math_special_functions -# error "__cpp_lib_math_special_functions should be defined in c++2a" +# error "__cpp_lib_math_special_functions should be defined in c++20" # endif # if __cpp_lib_math_special_functions != 201603L -# error "__cpp_lib_math_special_functions should have the value 201603L in c++2a" +# error "__cpp_lib_math_special_functions should have the value 201603L in c++20" # endif # else // _LIBCPP_VERSION # ifdef __cpp_lib_math_special_functions @@ -2226,10 +2226,10 @@ # if !defined(_LIBCPP_VERSION) # ifndef __cpp_lib_memory_resource -# error "__cpp_lib_memory_resource should be defined in c++2a" +# error "__cpp_lib_memory_resource should be defined in c++20" # endif # if __cpp_lib_memory_resource != 201603L -# error "__cpp_lib_memory_resource should have the value 201603L in c++2a" +# error "__cpp_lib_memory_resource should have the value 201603L in c++20" # endif # else // _LIBCPP_VERSION # ifdef __cpp_lib_memory_resource @@ -2238,46 +2238,46 @@ # endif # ifndef __cpp_lib_node_extract -# error "__cpp_lib_node_extract should be defined in c++2a" +# error "__cpp_lib_node_extract should be defined in c++20" # endif # if __cpp_lib_node_extract != 201606L -# error "__cpp_lib_node_extract should have the value 201606L in c++2a" +# error "__cpp_lib_node_extract should have the value 201606L in c++20" # endif # ifndef __cpp_lib_nonmember_container_access -# error "__cpp_lib_nonmember_container_access should be defined in c++2a" +# error "__cpp_lib_nonmember_container_access should be defined in c++20" # endif # if __cpp_lib_nonmember_container_access != 201411L -# error "__cpp_lib_nonmember_container_access should have the value 201411L in c++2a" +# error "__cpp_lib_nonmember_container_access should have the value 201411L in c++20" # endif # ifndef __cpp_lib_not_fn -# error "__cpp_lib_not_fn should be defined in c++2a" +# error "__cpp_lib_not_fn should be defined in c++20" # endif # if __cpp_lib_not_fn != 201603L -# error "__cpp_lib_not_fn should have the value 201603L in c++2a" +# error "__cpp_lib_not_fn should have the value 201603L in c++20" # endif # ifndef __cpp_lib_null_iterators -# error "__cpp_lib_null_iterators should be defined in c++2a" +# error "__cpp_lib_null_iterators should be defined in c++20" # endif # if __cpp_lib_null_iterators != 201304L -# error "__cpp_lib_null_iterators should have the value 201304L in c++2a" +# error "__cpp_lib_null_iterators should have the value 201304L in c++20" # endif # ifndef __cpp_lib_optional -# error "__cpp_lib_optional should be defined in c++2a" +# error "__cpp_lib_optional should be defined in c++20" # endif # if __cpp_lib_optional != 201606L -# error "__cpp_lib_optional should have the value 201606L in c++2a" +# error "__cpp_lib_optional should have the value 201606L in c++20" # endif # if !defined(_LIBCPP_VERSION) # ifndef __cpp_lib_parallel_algorithm -# error "__cpp_lib_parallel_algorithm should be defined in c++2a" +# error "__cpp_lib_parallel_algorithm should be defined in c++20" # endif # if __cpp_lib_parallel_algorithm != 201603L -# error "__cpp_lib_parallel_algorithm should have the value 201603L in c++2a" +# error "__cpp_lib_parallel_algorithm should have the value 201603L in c++20" # endif # else // _LIBCPP_VERSION # ifdef __cpp_lib_parallel_algorithm @@ -2286,18 +2286,18 @@ # endif # ifndef __cpp_lib_quoted_string_io -# error "__cpp_lib_quoted_string_io should be defined in c++2a" +# error "__cpp_lib_quoted_string_io should be defined in c++20" # endif # if __cpp_lib_quoted_string_io != 201304L -# error "__cpp_lib_quoted_string_io should have the value 201304L in c++2a" +# error "__cpp_lib_quoted_string_io should have the value 201304L in c++20" # endif # if !defined(_LIBCPP_VERSION) # ifndef __cpp_lib_ranges -# error "__cpp_lib_ranges should be defined in c++2a" +# error "__cpp_lib_ranges should be defined in c++20" # endif # if __cpp_lib_ranges != 201811L -# error "__cpp_lib_ranges should have the value 201811L in c++2a" +# error "__cpp_lib_ranges should have the value 201811L in c++20" # endif # else // _LIBCPP_VERSION # ifdef __cpp_lib_ranges @@ -2306,46 +2306,46 @@ # endif # ifndef __cpp_lib_raw_memory_algorithms -# error "__cpp_lib_raw_memory_algorithms should be defined in c++2a" +# error "__cpp_lib_raw_memory_algorithms should be defined in c++20" # endif # if __cpp_lib_raw_memory_algorithms != 201606L -# error "__cpp_lib_raw_memory_algorithms should have the value 201606L in c++2a" +# error "__cpp_lib_raw_memory_algorithms should have the value 201606L in c++20" # endif # ifndef __cpp_lib_result_of_sfinae -# error "__cpp_lib_result_of_sfinae should be defined in c++2a" +# error "__cpp_lib_result_of_sfinae should be defined in c++20" # endif # if __cpp_lib_result_of_sfinae != 201210L -# error "__cpp_lib_result_of_sfinae should have the value 201210L in c++2a" +# error "__cpp_lib_result_of_sfinae should have the value 201210L in c++20" # endif # ifndef __cpp_lib_robust_nonmodifying_seq_ops -# error "__cpp_lib_robust_nonmodifying_seq_ops should be defined in c++2a" +# error "__cpp_lib_robust_nonmodifying_seq_ops should be defined in c++20" # endif # if __cpp_lib_robust_nonmodifying_seq_ops != 201304L -# error "__cpp_lib_robust_nonmodifying_seq_ops should have the value 201304L in c++2a" +# error "__cpp_lib_robust_nonmodifying_seq_ops should have the value 201304L in c++20" # endif # ifndef __cpp_lib_sample -# error "__cpp_lib_sample should be defined in c++2a" +# error "__cpp_lib_sample should be defined in c++20" # endif # if __cpp_lib_sample != 201603L -# error "__cpp_lib_sample should have the value 201603L in c++2a" +# error "__cpp_lib_sample should have the value 201603L in c++20" # endif # ifndef __cpp_lib_scoped_lock -# error "__cpp_lib_scoped_lock should be defined in c++2a" +# error "__cpp_lib_scoped_lock should be defined in c++20" # endif # if __cpp_lib_scoped_lock != 201703L -# error "__cpp_lib_scoped_lock should have the value 201703L in c++2a" +# error "__cpp_lib_scoped_lock should have the value 201703L in c++20" # endif # if !defined(_LIBCPP_HAS_NO_THREADS) # ifndef __cpp_lib_shared_mutex -# error "__cpp_lib_shared_mutex should be defined in c++2a" +# error "__cpp_lib_shared_mutex should be defined in c++20" # endif # if __cpp_lib_shared_mutex != 201505L -# error "__cpp_lib_shared_mutex should have the value 201505L in c++2a" +# error "__cpp_lib_shared_mutex should have the value 201505L in c++20" # endif # else # ifdef __cpp_lib_shared_mutex @@ -2354,25 +2354,25 @@ # endif # ifndef __cpp_lib_shared_ptr_arrays -# error "__cpp_lib_shared_ptr_arrays should be defined in c++2a" +# error "__cpp_lib_shared_ptr_arrays should be defined in c++20" # endif # if __cpp_lib_shared_ptr_arrays != 201611L -# error "__cpp_lib_shared_ptr_arrays should have the value 201611L in c++2a" +# error "__cpp_lib_shared_ptr_arrays should have the value 201611L in c++20" # endif # ifndef __cpp_lib_shared_ptr_weak_type -# error "__cpp_lib_shared_ptr_weak_type should be defined in c++2a" +# error "__cpp_lib_shared_ptr_weak_type should be defined in c++20" # endif # if __cpp_lib_shared_ptr_weak_type != 201606L -# error "__cpp_lib_shared_ptr_weak_type should have the value 201606L in c++2a" +# error "__cpp_lib_shared_ptr_weak_type should have the value 201606L in c++20" # endif # if !defined(_LIBCPP_HAS_NO_THREADS) # ifndef __cpp_lib_shared_timed_mutex -# error "__cpp_lib_shared_timed_mutex should be defined in c++2a" +# error "__cpp_lib_shared_timed_mutex should be defined in c++20" # endif # if __cpp_lib_shared_timed_mutex != 201402L -# error "__cpp_lib_shared_timed_mutex should have the value 201402L in c++2a" +# error "__cpp_lib_shared_timed_mutex should have the value 201402L in c++20" # endif # else # ifdef __cpp_lib_shared_timed_mutex @@ -2381,32 +2381,32 @@ # endif # ifndef __cpp_lib_span -# error "__cpp_lib_span should be defined in c++2a" +# error "__cpp_lib_span should be defined in c++20" # endif # if __cpp_lib_span != 202002L -# error "__cpp_lib_span should have the value 202002L in c++2a" +# error "__cpp_lib_span should have the value 202002L in c++20" # endif # ifndef __cpp_lib_string_udls -# error "__cpp_lib_string_udls should be defined in c++2a" +# error "__cpp_lib_string_udls should be defined in c++20" # endif # if __cpp_lib_string_udls != 201304L -# error "__cpp_lib_string_udls should have the value 201304L in c++2a" +# error "__cpp_lib_string_udls should have the value 201304L in c++20" # endif # ifndef __cpp_lib_string_view -# error "__cpp_lib_string_view should be defined in c++2a" +# error "__cpp_lib_string_view should be defined in c++20" # endif # if __cpp_lib_string_view != 201606L -# error "__cpp_lib_string_view should have the value 201606L in c++2a" +# error "__cpp_lib_string_view should have the value 201606L in c++20" # endif # if !defined(_LIBCPP_VERSION) # ifndef __cpp_lib_three_way_comparison -# error "__cpp_lib_three_way_comparison should be defined in c++2a" +# error "__cpp_lib_three_way_comparison should be defined in c++20" # endif # if __cpp_lib_three_way_comparison != 201711L -# error "__cpp_lib_three_way_comparison should have the value 201711L in c++2a" +# error "__cpp_lib_three_way_comparison should have the value 201711L in c++20" # endif # else // _LIBCPP_VERSION # ifdef __cpp_lib_three_way_comparison @@ -2415,18 +2415,18 @@ # endif # ifndef __cpp_lib_to_array -# error "__cpp_lib_to_array should be defined in c++2a" +# error "__cpp_lib_to_array should be defined in c++20" # endif # if __cpp_lib_to_array != 201907L -# error "__cpp_lib_to_array should have the value 201907L in c++2a" +# error "__cpp_lib_to_array should have the value 201907L in c++20" # endif # if !defined(_LIBCPP_VERSION) # ifndef __cpp_lib_to_chars -# error "__cpp_lib_to_chars should be defined in c++2a" +# error "__cpp_lib_to_chars should be defined in c++20" # endif # if __cpp_lib_to_chars != 201611L -# error "__cpp_lib_to_chars should have the value 201611L in c++2a" +# error "__cpp_lib_to_chars should have the value 201611L in c++20" # endif # else // _LIBCPP_VERSION # ifdef __cpp_lib_to_chars @@ -2435,68 +2435,68 @@ # endif # ifndef __cpp_lib_transformation_trait_aliases -# error "__cpp_lib_transformation_trait_aliases should be defined in c++2a" +# error "__cpp_lib_transformation_trait_aliases should be defined in c++20" # endif # if __cpp_lib_transformation_trait_aliases != 201304L -# error "__cpp_lib_transformation_trait_aliases should have the value 201304L in c++2a" +# error "__cpp_lib_transformation_trait_aliases should have the value 201304L in c++20" # endif # ifndef __cpp_lib_transparent_operators -# error "__cpp_lib_transparent_operators should be defined in c++2a" +# error "__cpp_lib_transparent_operators should be defined in c++20" # endif # if __cpp_lib_transparent_operators != 201510L -# error "__cpp_lib_transparent_operators should have the value 201510L in c++2a" +# error "__cpp_lib_transparent_operators should have the value 201510L in c++20" # endif # ifndef __cpp_lib_tuple_element_t -# error "__cpp_lib_tuple_element_t should be defined in c++2a" +# error "__cpp_lib_tuple_element_t should be defined in c++20" # endif # if __cpp_lib_tuple_element_t != 201402L -# error "__cpp_lib_tuple_element_t should have the value 201402L in c++2a" +# error "__cpp_lib_tuple_element_t should have the value 201402L in c++20" # endif # ifndef __cpp_lib_tuples_by_type -# error "__cpp_lib_tuples_by_type should be defined in c++2a" +# error "__cpp_lib_tuples_by_type should be defined in c++20" # endif # if __cpp_lib_tuples_by_type != 201304L -# error "__cpp_lib_tuples_by_type should have the value 201304L in c++2a" +# error "__cpp_lib_tuples_by_type should have the value 201304L in c++20" # endif # ifndef __cpp_lib_type_trait_variable_templates -# error "__cpp_lib_type_trait_variable_templates should be defined in c++2a" +# error "__cpp_lib_type_trait_variable_templates should be defined in c++20" # endif # if __cpp_lib_type_trait_variable_templates != 201510L -# error "__cpp_lib_type_trait_variable_templates should have the value 201510L in c++2a" +# error "__cpp_lib_type_trait_variable_templates should have the value 201510L in c++20" # endif # ifndef __cpp_lib_uncaught_exceptions -# error "__cpp_lib_uncaught_exceptions should be defined in c++2a" +# error "__cpp_lib_uncaught_exceptions should be defined in c++20" # endif # if __cpp_lib_uncaught_exceptions != 201411L -# error "__cpp_lib_uncaught_exceptions should have the value 201411L in c++2a" +# error "__cpp_lib_uncaught_exceptions should have the value 201411L in c++20" # endif # ifndef __cpp_lib_unordered_map_try_emplace -# error "__cpp_lib_unordered_map_try_emplace should be defined in c++2a" +# error "__cpp_lib_unordered_map_try_emplace should be defined in c++20" # endif # if __cpp_lib_unordered_map_try_emplace != 201411L -# error "__cpp_lib_unordered_map_try_emplace should have the value 201411L in c++2a" +# error "__cpp_lib_unordered_map_try_emplace should have the value 201411L in c++20" # endif # ifndef __cpp_lib_variant -# error "__cpp_lib_variant should be defined in c++2a" +# error "__cpp_lib_variant should be defined in c++20" # endif # if __cpp_lib_variant != 201606L -# error "__cpp_lib_variant should have the value 201606L in c++2a" +# error "__cpp_lib_variant should have the value 201606L in c++20" # endif # ifndef __cpp_lib_void_t -# error "__cpp_lib_void_t should be defined in c++2a" +# error "__cpp_lib_void_t should be defined in c++20" # endif # if __cpp_lib_void_t != 201411L -# error "__cpp_lib_void_t should have the value 201411L in c++2a" +# error "__cpp_lib_void_t should have the value 201411L in c++20" # endif -#endif // TEST_STD_VER > 17 +#endif // TEST_STD_VER == 20 int main(int, char**) { return 0; } diff --git a/libcxx/test/support/test_macros.h b/libcxx/test/support/test_macros.h index f50f48fe046bb3..5f8ac2e8b8aa37 100644 --- a/libcxx/test/support/test_macros.h +++ b/libcxx/test/support/test_macros.h @@ -101,6 +101,8 @@ # define TEST_STD_VER 14 #elif __cplusplus <= 201703L # define TEST_STD_VER 17 +#elif __cplusplus <= 202002L +# define TEST_STD_VER 20 #else # define TEST_STD_VER 99 // greater than current standard // This is deliberately different than _LIBCPP_STD_VER to discourage matching them up. diff --git a/libcxx/utils/ci/buildkite-pipeline.yml b/libcxx/utils/ci/buildkite-pipeline.yml index d10c464f9d55db..2a469f30002d1f 100644 --- a/libcxx/utils/ci/buildkite-pipeline.yml +++ b/libcxx/utils/ci/buildkite-pipeline.yml @@ -64,7 +64,7 @@ steps: limit: 2 - label: "C++20" - command: "libcxx/utils/ci/run-buildbot generic-cxx2a" + command: "libcxx/utils/ci/run-buildbot generic-cxx20" artifact_paths: - "**/test-results.xml" - "**/*.abilist" @@ -186,7 +186,7 @@ steps: limit: 2 - label: "MacOS C++20" - command: "libcxx/utils/ci/run-buildbot generic-cxx2a" + command: "libcxx/utils/ci/run-buildbot generic-cxx20" artifact_paths: - "**/test-results.xml" - "**/*.abilist" diff --git a/libcxx/utils/ci/run-buildbot b/libcxx/utils/ci/run-buildbot index 20dca5917e79a4..3a394de4f2d0c5 100755 --- a/libcxx/utils/ci/run-buildbot +++ b/libcxx/utils/ci/run-buildbot @@ -137,11 +137,11 @@ generic-cxx17) check-cxx-cxxabi check-abi-list ;; -generic-cxx2a) +generic-cxx20) export CC=clang export CXX=clang++ clean - generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-cxx2a.cmake" + generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-cxx20.cmake" check-cxx-cxxabi check-abi-list ;; diff --git a/libcxx/utils/generate_feature_test_macro_components.py b/libcxx/utils/generate_feature_test_macro_components.py index 091fea431384ca..2302dc4ec505b4 100755 --- a/libcxx/utils/generate_feature_test_macro_components.py +++ b/libcxx/utils/generate_feature_test_macro_components.py @@ -289,7 +289,7 @@ def add_version_header(tc): "headers": ["unordered_map"], }, { "name": "__cpp_lib_array_constexpr", - "values": { "c++17": int(201603), "c++2a": int(201811) }, + "values": { "c++17": int(201603), "c++20": int(201811) }, "headers": ["iterator", "array"], }, { "name": "__cpp_lib_nonmember_container_access", @@ -328,22 +328,22 @@ def add_version_header(tc): "values": { "c++17": int(201703) }, "headers": ["mutex"], }, - # C++2a + # C++20 { "name": "__cpp_lib_char8_t", - "values": { "c++2a": int(201811) }, + "values": { "c++20": int(201811) }, "headers": ["atomic", "filesystem", "istream", "limits", "locale", "ostream", "string", "string_view"], "depends": "defined(__cpp_char8_t)", "internal_depends": "!defined(_LIBCPP_NO_HAS_CHAR8_T)", }, { "name": "__cpp_lib_erase_if", - "values": { "c++2a": int(202002) }, + "values": { "c++20": int(202002) }, "headers": ["string", "deque", "forward_list", "list", "vector", "map", "set", "unordered_map", "unordered_set"] }, { "name": "__cpp_lib_destroying_delete", - "values": { "c++2a": int(201806) }, + "values": { "c++20": int(201806) }, "headers": ["new"], "depends": "TEST_STD_VER > 17" @@ -355,135 +355,135 @@ def add_version_header(tc): " && __cpp_impl_destroying_delete >= 201806L", }, { "name": "__cpp_lib_three_way_comparison", - "values": { "c++2a": int(201711) }, + "values": { "c++20": int(201711) }, "headers": ["compare"], "unimplemented": True, }, { "name": "__cpp_lib_concepts", - "values": { "c++2a": int(201806) }, + "values": { "c++20": int(201806) }, "headers": ["concepts"], "unimplemented": True, }, { "name": "__cpp_lib_constexpr_swap_algorithms", - "values": { "c++2a": int(201806) }, + "values": { "c++20": int(201806) }, "headers": ["algorithm"], "unimplemented": True, }, { "name": "__cpp_lib_constexpr_functional", - "values": { "c++2a": int(201907) }, + "values": { "c++20": int(201907) }, "headers": ["functional"], }, { "name": "__cpp_lib_constexpr_numeric", - "values": { "c++2a": int(201911) }, + "values": { "c++20": int(201911) }, "headers": ["numeric"], }, { "name": "__cpp_lib_bind_front", - "values": { "c++2a": int(201811) }, + "values": { "c++20": int(201811) }, "headers": ["functional"], "unimplemented": True, }, { "name": "__cpp_lib_is_constant_evaluated", - "values": { "c++2a": int(201811) }, + "values": { "c++20": int(201811) }, "headers": ["type_traits"], "depends": "TEST_HAS_BUILTIN(__builtin_is_constant_evaluated) || TEST_GCC_VER >= 900", "internal_depends": "!defined(_LIBCPP_HAS_NO_BUILTIN_IS_CONSTANT_EVALUATED)", }, { "name": "__cpp_lib_list_remove_return_type", - "values": { "c++2a": int(201806) }, + "values": { "c++20": int(201806) }, "headers": ["forward_list", "list"], }, { "name": "__cpp_lib_generic_unordered_lookup", - "values": { "c++2a": int(201811) }, + "values": { "c++20": int(201811) }, "headers": ["unordered_map", "unordered_set"], }, { "name": "__cpp_lib_ranges", - "values": { "c++2a": int(201811) }, + "values": { "c++20": int(201811) }, "headers": ["algorithm", "functional", "iterator", "memory", "ranges"], "unimplemented": True, }, { "name": "__cpp_lib_bit_cast", - "values": { "c++2a": int(201806) }, + "values": { "c++20": int(201806) }, "headers": ["bit"], "unimplemented": True, }, { "name": "__cpp_lib_atomic_ref", - "values": { "c++2a": int(201806) }, + "values": { "c++20": int(201806) }, "headers": ["atomic"], "unimplemented": True, "depends": "!defined(_LIBCPP_HAS_NO_THREADS)", "internal_depends": "!defined(_LIBCPP_HAS_NO_THREADS)", }, { "name": "__cpp_lib_int_pow2", - "values": { "c++2a": int(202002) }, + "values": { "c++20": int(202002) }, "headers": ["bit"], }, { "name": "__cpp_lib_interpolate", - "values": { "c++2a": int(201902) }, + "values": { "c++20": int(201902) }, "headers": ["numeric"], }, { "name": "__cpp_lib_endian", - "values": { "c++2a": int(201907) }, + "values": { "c++20": int(201907) }, "headers": ["bit"], }, { "name": "__cpp_lib_to_array", - "values": { "c++2a": int(201907) }, + "values": { "c++20": int(201907) }, "headers": ["array"], }, { "name": "__cpp_lib_span", - "values": { "c++2a": int(202002) }, + "values": { "c++20": int(202002) }, "headers": ["span"], }, { "name": "__cpp_lib_math_constants", - "values": { "c++2a": int(201907) }, + "values": { "c++20": int(201907) }, "headers": ["numbers"], "depends": "defined(__cpp_concepts) && __cpp_concepts >= 201811L", "internal_depends": "defined(__cpp_concepts) && __cpp_concepts >= 201811L", }, { "name": "__cpp_lib_constexpr_utility", - "values": { "c++2a": int(201811) }, + "values": { "c++20": int(201811) }, "headers": ["utility"], }, { "name": "__cpp_lib_atomic_flag_test", - "values": { "c++2a": int(201907) }, + "values": { "c++20": int(201907) }, "headers": ["atomic"], "depends": "!defined(_LIBCPP_HAS_NO_THREADS)", "internal_depends": "!defined(_LIBCPP_HAS_NO_THREADS)", }, { "name": "__cpp_lib_atomic_lock_free_type_aliases", - "values": { "c++2a": int(201907) }, + "values": { "c++20": int(201907) }, "headers": ["atomic"], "depends": "!defined(_LIBCPP_HAS_NO_THREADS)", "internal_depends": "!defined(_LIBCPP_HAS_NO_THREADS)", }, { "name": "__cpp_lib_atomic_wait", - "values": { "c++2a": int(201907) }, + "values": { "c++20": int(201907) }, "headers": ["atomic"], "depends": "!defined(_LIBCPP_HAS_NO_THREADS)", "internal_depends": "!defined(_LIBCPP_HAS_NO_THREADS)", }, { "name": "__cpp_lib_atomic_float", - "values": { "c++2a": int(201711) }, + "values": { "c++20": int(201711) }, "headers": ["atomic"], "unimplemented": True, "depends": "!defined(_LIBCPP_HAS_NO_THREADS)", "internal_depends": "!defined(_LIBCPP_HAS_NO_THREADS)", }, { "name": "__cpp_lib_atomic_shared_ptr", - "values": { "c++2a": int(201711) }, + "values": { "c++20": int(201711) }, "headers": ["atomic"], "unimplemented": True, "depends": "!defined(_LIBCPP_HAS_NO_THREADS)", "internal_depends": "!defined(_LIBCPP_HAS_NO_THREADS)", }, { "name": "__cpp_lib_atomic_value_initialization", - "values": { "c++2a": int(201911) }, + "values": { "c++20": int(201911) }, "headers": ["atomic", "memory"], "unimplemented": True, "depends": "!defined(_LIBCPP_HAS_NO_THREADS)", "internal_depends": "!defined(_LIBCPP_HAS_NO_THREADS)", }, { "name": "__cpp_lib_constexpr_dynamic_alloc", - "values": { "c++2a": int(201907) }, + "values": { "c++20": int(201907) }, "headers": ["memory"] }, ]], key=lambda tc: tc["name"]) @@ -506,7 +506,7 @@ def add_version_header(tc): } def get_std_dialects(): - std_dialects = ['c++14', 'c++17', 'c++2a'] + std_dialects = ['c++14', 'c++17', 'c++20'] return list(std_dialects) def get_first_std(d): @@ -656,7 +656,7 @@ def produce_version_header(): #endif #if _LIBCPP_STD_VER > 17 -{cxx2a_macros} +{cxx20_macros} #endif #endif // _LIBCPP_VERSIONH @@ -666,7 +666,7 @@ def produce_version_header(): 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(), - cxx2a_macros=produce_macros_definition_for_std('c++2a').strip()) + cxx20_macros=produce_macros_definition_for_std('c++20').strip()) version_header_path = os.path.join(include_path, 'version') with open(version_header_path, 'w', newline='\n') as f: @@ -798,11 +798,11 @@ def produce_tests(): {cxx17_tests} -#elif TEST_STD_VER > 17 +#elif TEST_STD_VER == 20 -{cxx2a_tests} +{cxx20_tests} -#endif // TEST_STD_VER > 17 +#endif // TEST_STD_VER == 20 int main(int, char**) {{ return 0; }} """.format(script_name=script_name, @@ -812,7 +812,7 @@ def produce_tests(): 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(), - cxx2a_tests=generate_std_test(test_list, 'c++2a').strip()) + cxx20_tests=generate_std_test(test_list, 'c++20').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: