From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2136) id AA27E39730BC; Wed, 17 Jun 2020 20:00:50 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AA27E39730BC DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1592424050; bh=6DT0HgjGQwTF3wExVBebdmDWeNCXlEafNrayzun53IM=; h=From:To:Subject:Date:From; b=JmU8+3qz0hbzqmi0XmepSGmSuT68koZLrwey9rqIGMH1BYIbw4NiZ2cC8JxnTRrll AkJm0vghAWFpt6PB9Eir36cdm6RHO6wh7VF1uT7+LYgBB0Q7RLV1hWnLPswQfZXri2 /oWKsDTTZHOoNuwGaDsRnrE4LpwqRsw60jUmAqy4= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Aldy Hernandez To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc/devel/ranger] libstdc++: Move definition earlier in file X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/devel/ranger X-Git-Oldrev: 491009b609d354d2a5b8327b2deba58e1f2b2215 X-Git-Newrev: 0302a2de7f143bc4ac2a963761abc684b4dd6ddb Message-Id: <20200617200050.AA27E39730BC@sourceware.org> Date: Wed, 17 Jun 2020 20:00:50 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Jun 2020 20:00:50 -0000 https://gcc.gnu.org/g:0302a2de7f143bc4ac2a963761abc684b4dd6ddb commit 0302a2de7f143bc4ac2a963761abc684b4dd6ddb Author: Jonathan Wakely 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 + + * include/std/type_traits (__is_array_convertible): Move definition + to immediately after is_convertible. + 2020-03-26 Jonathan Wakely * 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, shared_ptr, and span + template + using __is_array_convertible + = is_convertible<_FromElementType(*)[], _ToElementType(*)[]>; + template, is_function<_To>, is_array<_To>>::value> @@ -1465,11 +1470,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION }; #pragma GCC diagnostic pop - // helper trait for unique_ptr, shared_ptr, and span - template - using __is_array_convertible - = is_convertible<_FromElementType(*)[], _ToElementType(*)[]>; - // is_nothrow_convertible for C++11 template struct __is_nothrow_convertible