diff options
| author | robot-piglet <robot-piglet@yandex-team.com> | 2024-05-27 00:00:53 +0300 |
|---|---|---|
| committer | robot-piglet <robot-piglet@yandex-team.com> | 2024-05-27 00:08:46 +0300 |
| commit | b781230b3ce25da73dcb68e913313a2e5328352a (patch) | |
| tree | 53b184a209fbb786e08953c4ff9c7fd23dcfe797 /contrib/libs | |
| parent | 187743291b2c746066e975e72d09b61004aebf54 (diff) | |
| download | ydb-b781230b3ce25da73dcb68e913313a2e5328352a.tar.gz | |
Intermediate changes
Diffstat (limited to 'contrib/libs')
| -rw-r--r-- | contrib/libs/cxxsupp/libcxxmsvc/include/initializer_list | 6 | ||||
| -rw-r--r-- | contrib/libs/cxxsupp/libcxxmsvc/include/version | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/contrib/libs/cxxsupp/libcxxmsvc/include/initializer_list b/contrib/libs/cxxsupp/libcxxmsvc/include/initializer_list index 827f137fd5..66b0575cb7 100644 --- a/contrib/libs/cxxsupp/libcxxmsvc/include/initializer_list +++ b/contrib/libs/cxxsupp/libcxxmsvc/include/initializer_list @@ -47,7 +47,13 @@ template<class E> const E* end(initializer_list<E> il) noexcept; // constexpr in #if defined(_LIBCPP_COMPILER_MSVC) && !defined(__clang__) +// save __cpp_lib_concepts because it can be redefined inside MSVC standard headers +#pragma push_macro("__cpp_lib_concepts") + #include Y_MSVC_INCLUDE_NEXT(yvals.h) + +#pragma pop_macro("__cpp_lib_concepts") + #include Y_MSVC_INCLUDE_NEXT(initializer_list) #else diff --git a/contrib/libs/cxxsupp/libcxxmsvc/include/version b/contrib/libs/cxxsupp/libcxxmsvc/include/version index 25d112af18..0dadcfbbb5 100644 --- a/contrib/libs/cxxsupp/libcxxmsvc/include/version +++ b/contrib/libs/cxxsupp/libcxxmsvc/include/version @@ -314,7 +314,9 @@ __cpp_lib_void_t 201411L <type_traits> # if !defined(_LIBCPP_HAS_NO_CHAR8_T) # define __cpp_lib_char8_t 201907L # endif -# define __cpp_lib_concepts 202002L +# if !defined(_LIBCPP_HAS_NO_CONCEPTS) +# define __cpp_lib_concepts 202002L +# endif # define __cpp_lib_constexpr_algorithms 201806L // # define __cpp_lib_constexpr_complex 201711L # define __cpp_lib_constexpr_dynamic_alloc 201907L |