From 008e439f34d4b356825a6c9b70245143f00bd353 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Tue, 8 Aug 2023 16:24:31 +0100 Subject: [PATCH] libstdc++: Explicitly default some copy ctors and assignments The standard says that the implicit copy assignment operator is deprecated for classes that have a user-provided copy constructor, and vice versa. libstdc++-v3/ChangeLog: * include/bits/new_allocator.h (__new_allocator): Define copy assignment operator as defaulted. * include/std/complex (complex, complex) (complex): Define copy constructor as defaulted. --- libstdc++-v3/include/bits/new_allocator.h | 4 ++++ libstdc++-v3/include/std/complex | 13 +++++++++++++ 2 files changed, 17 insertions(+) diff --git a/libstdc++-v3/include/bits/new_allocator.h b/libstdc++-v3/include/bits/new_allocator.h index 0a0b12eb5041..357700292edc 100644 --- a/libstdc++-v3/include/bits/new_allocator.h +++ b/libstdc++-v3/include/bits/new_allocator.h @@ -96,6 +96,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _GLIBCXX20_CONSTEXPR __new_allocator(const __new_allocator<_Tp1>&) _GLIBCXX_USE_NOEXCEPT { } +#if __cplusplus >= 201103L + __new_allocator& operator=(const __new_allocator&) = default; +#endif + #if __cplusplus <= 201703L ~__new_allocator() _GLIBCXX_USE_NOEXCEPT { } diff --git a/libstdc++-v3/include/std/complex b/libstdc++-v3/include/std/complex index f01a3af43718..0ba2167bf022 100644 --- a/libstdc++-v3/include/std/complex +++ b/libstdc++-v3/include/std/complex @@ -1359,6 +1359,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } #endif +#if __cplusplus >= 201103L + _GLIBCXX14_CONSTEXPR complex(const complex&) = default; +#endif + #if __cplusplus > 202002L template explicit(!requires(_Up __u) { value_type{__u}; }) @@ -1512,6 +1516,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } #endif +#if __cplusplus >= 201103L + _GLIBCXX14_CONSTEXPR complex(const complex&) = default; +#endif + #if __cplusplus > 202002L template explicit(!requires(_Up __u) { value_type{__u}; }) @@ -1666,6 +1674,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } #endif +#if __cplusplus >= 201103L + _GLIBCXX14_CONSTEXPR complex(const complex&) = default; +#endif + #if __cplusplus > 202002L template explicit(!requires(_Up __u) { value_type{__u}; }) @@ -1901,6 +1913,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // Let the compiler synthesize the copy and assignment // operator. It always does a pretty good job. + constexpr complex(const complex&) = default; constexpr complex& operator=(const complex&) = default; template -- 2.47.2