summaryrefslogtreecommitdiffstats
path: root/contrib/libs/cxxsupp/libcxx/patches/67-uninitialized-algorithms.patch
diff options
context:
space:
mode:
authormikhnenko <[email protected]>2024-12-18 19:08:08 +0300
committermikhnenko <[email protected]>2024-12-18 19:29:26 +0300
commit7ed76959e6c06dbc4c249ce0f3b930463a6b65db (patch)
tree0e9528cb7261812a5ae7ed177048721eaebf8ed0 /contrib/libs/cxxsupp/libcxx/patches/67-uninitialized-algorithms.patch
parent4c8e7f015711b5175d63e1a87cbd40c49ce7aa70 (diff)
libc++: Run clang-format from upstream and update to 9783f28cbb155e4a8d49c12e1c60ce14dcfaf0c7
commit_hash:ca4954fe054e5a7190ad11ab71bfc7ca0965bca2
Diffstat (limited to 'contrib/libs/cxxsupp/libcxx/patches/67-uninitialized-algorithms.patch')
-rw-r--r--contrib/libs/cxxsupp/libcxx/patches/67-uninitialized-algorithms.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/contrib/libs/cxxsupp/libcxx/patches/67-uninitialized-algorithms.patch b/contrib/libs/cxxsupp/libcxx/patches/67-uninitialized-algorithms.patch
index 37f86fc4331..8e5030e6315 100644
--- a/contrib/libs/cxxsupp/libcxx/patches/67-uninitialized-algorithms.patch
+++ b/contrib/libs/cxxsupp/libcxx/patches/67-uninitialized-algorithms.patch
@@ -1,8 +1,8 @@
diff --git a/include/__memory/uninitialized_algorithms.h b/include/__memory/uninitialized_algorithms.h
-index b0eb700..4b55b7c 100644
+index 2a4ecf6..e2a6f8d 100644
--- a/include/__memory/uninitialized_algorithms.h
+++ b/include/__memory/uninitialized_algorithms.h
-@@ -573,6 +573,7 @@ struct __allocator_has_trivial_copy_construct : _Not<__has_construct<_Alloc, _Ty
+@@ -558,6 +558,7 @@ struct __allocator_has_trivial_copy_construct : _Not<__has_construct<_Alloc, _Ty
template <class _Type>
struct __allocator_has_trivial_copy_construct<allocator<_Type>, _Type> : true_type {};
@@ -10,15 +10,15 @@ index b0eb700..4b55b7c 100644
template <class _Alloc,
class _In,
class _RawTypeIn = __remove_const_t<_In>,
-@@ -596,6 +597,7 @@ __uninitialized_allocator_copy_impl(_Alloc&, _In* __first1, _In* __last1, _Out*
+@@ -581,6 +582,7 @@ __uninitialized_allocator_copy_impl(_Alloc&, _In* __first1, _In* __last1, _Out*
return std::copy(__first1, __last1, const_cast<_RawTypeIn*>(__first2));
}
}
+#endif // __CUDACC__
template <class _Alloc, class _Iter1, class _Sent1, class _Iter2>
- _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _Iter2 __uninitialized_allocator_copy(_Alloc& __alloc, _Iter1 __first1, _Sent1 __last1, _Iter2 __first2) {
-@@ -636,7 +638,7 @@ struct __allocator_has_trivial_move_construct : _Not<__has_construct<_Alloc, _Ty
+ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _Iter2
+@@ -623,7 +625,7 @@ struct __allocator_has_trivial_move_construct : _Not<__has_construct<_Alloc, _Ty
template <class _Type>
struct __allocator_has_trivial_move_construct<allocator<_Type>, _Type> : true_type {};
@@ -27,7 +27,7 @@ index b0eb700..4b55b7c 100644
template <
class _Alloc,
class _Iter1,
-@@ -657,7 +659,7 @@ __uninitialized_allocator_move_if_noexcept(_Alloc&, _Iter1 __first1, _Iter1 __la
+@@ -644,7 +646,7 @@ __uninitialized_allocator_move_if_noexcept(_Alloc&, _Iter1 __first1, _Iter1 __la
return std::move(__first1, __last1, __first2);
}
}