diff options
| author | thegeorg <[email protected]> | 2022-07-20 11:09:37 +0300 |
|---|---|---|
| committer | thegeorg <[email protected]> | 2022-07-20 11:09:37 +0300 |
| commit | 4c24c91c583db70673b56f8a2b85f69e6e4fd8a0 (patch) | |
| tree | 0b13c4c769e1a93978fa21c5faeac91f77931b63 /contrib/libs/cxxsupp/libcxx/include | |
| parent | 498cb5e6cb06a1064f60c2bda540935fa069d272 (diff) | |
Avoid constructor conflicts when compiling with -std=c++2b
We would like to mark this ctor deleted in both `-std=c++20` and `-std=c++23` modes.
Diffstat (limited to 'contrib/libs/cxxsupp/libcxx/include')
| -rw-r--r-- | contrib/libs/cxxsupp/libcxx/include/string | 5 | ||||
| -rw-r--r-- | contrib/libs/cxxsupp/libcxx/include/string_view | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/contrib/libs/cxxsupp/libcxx/include/string b/contrib/libs/cxxsupp/libcxx/include/string index 9757b64df42..0cbe4e06148 100644 --- a/contrib/libs/cxxsupp/libcxx/include/string +++ b/contrib/libs/cxxsupp/libcxx/include/string @@ -792,7 +792,7 @@ public: _NOEXCEPT; #endif -#if _LIBCPP_STD_VER > 20 +#if _LIBCPP_STD_VER > 17 basic_string(nullptr_t) = delete; #endif @@ -800,9 +800,6 @@ public: basic_string(basic_string&& __str, const allocator_type& __a); #endif // _LIBCPP_CXX03_LANG - _LIBCPP_CONSTEXPR _LIBCPP_INLINE_VISIBILITY - basic_string(nullptr_t) = delete; - template <class = __enable_if_t<__is_allocator<_Allocator>::value, nullptr_t> > _LIBCPP_INLINE_VISIBILITY basic_string(const _CharT* __s) : __r_(__default_init_tag(), __default_init_tag()) { diff --git a/contrib/libs/cxxsupp/libcxx/include/string_view b/contrib/libs/cxxsupp/libcxx/include/string_view index 0688b1d31ff..6d99e6403de 100644 --- a/contrib/libs/cxxsupp/libcxx/include/string_view +++ b/contrib/libs/cxxsupp/libcxx/include/string_view @@ -324,13 +324,10 @@ public: #endif _LIBCPP_CONSTEXPR _LIBCPP_INLINE_VISIBILITY - basic_string_view(nullptr_t) = delete; - - _LIBCPP_CONSTEXPR _LIBCPP_INLINE_VISIBILITY basic_string_view(const _CharT* __s) : __data(__s), __size(_VSTD::__char_traits_length_checked<_Traits>(__s)) {} -#if _LIBCPP_STD_VER > 20 +#if _LIBCPP_STD_VER > 17 basic_string_view(nullptr_t) = delete; #endif |