public inbox for libstdc++-cvs@sourceware.org help / color / mirror / Atom feed
From: Aldy Hernandez <aldyh@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc/devel/ranger] libstdc++: Move definition earlier in file Date: Wed, 17 Jun 2020 20:00:50 +0000 (GMT) [thread overview] Message-ID: <20200617200050.AA27E39730BC@sourceware.org> (raw) https://gcc.gnu.org/g:0302a2de7f143bc4ac2a963761abc684b4dd6ddb commit 0302a2de7f143bc4ac2a963761abc684b4dd6ddb Author: Jonathan Wakely <jwakely@redhat.com> Date: Fri Mar 27 22:53:04 2020 +0000 libstdc++: Move definition earlier in file This moves __is_array_convertible so it's not between __is_nothrow_convertible and its helper, since it isn't related to those. * include/std/type_traits (__is_array_convertible): Move definition to immediately after is_convertible. Diff: --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/include/std/type_traits | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 2445acb50da..e9bb4bf3980 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2020-03-27 Jonathan Wakely <jwakely@redhat.com> + + * include/std/type_traits (__is_array_convertible): Move definition + to immediately after is_convertible. + 2020-03-26 Jonathan Wakely <jwakely@redhat.com> * include/std/chrono (chrono::days, chrono::weeks, chrono::years) diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits index 68abf148a38..65b9902b56d 100644 --- a/libstdc++-v3/include/std/type_traits +++ b/libstdc++-v3/include/std/type_traits @@ -1436,6 +1436,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION : public __is_convertible_helper<_From, _To>::type { }; + // helper trait for unique_ptr<T[]>, shared_ptr<T[]>, and span<T, N> + template<typename _ToElementType, typename _FromElementType> + using __is_array_convertible + = is_convertible<_FromElementType(*)[], _ToElementType(*)[]>; + template<typename _From, typename _To, bool = __or_<is_void<_From>, is_function<_To>, is_array<_To>>::value> @@ -1465,11 +1470,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION }; #pragma GCC diagnostic pop - // helper trait for unique_ptr<T[]>, shared_ptr<T[]>, and span<T, N> - template<typename _ToElementType, typename _FromElementType> - using __is_array_convertible - = is_convertible<_FromElementType(*)[], _ToElementType(*)[]>; - // is_nothrow_convertible for C++11 template<typename _From, typename _To> struct __is_nothrow_convertible
reply other threads:[~2020-06-17 20:00 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200617200050.AA27E39730BC@sourceware.org \ --to=aldyh@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ --cc=libstdc++-cvs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).