From owner-svn-src-stable-9@FreeBSD.ORG Thu Dec 4 01:21:57 2014
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 86420BB9;
Thu, 4 Dec 2014 01:21:57 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 714DCC69;
Thu, 4 Dec 2014 01:21:57 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sB41LvvZ062924;
Thu, 4 Dec 2014 01:21:57 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id sB41Lv5T062923;
Thu, 4 Dec 2014 01:21:57 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <201412040121.sB41Lv5T062923@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org
using -f
From: Dimitry Andric <dim@FreeBSD.org>
Date: Thu, 4 Dec 2014 01:21:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r275472 - in stable: 10/contrib/libc++/include
9/contrib/libc++/include
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable-9>,
<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9/>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>,
<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Dec 2014 01:21:57 -0000
Author: dim
Date: Thu Dec 4 01:21:56 2014
New Revision: 275472
URL: https://svnweb.freebsd.org/changeset/base/275472
Log:
MFC r275366:
Pull in r209785 from upstream libc++ trunk (by Marshall Clow):
Fix a problem exposed by r208825, which caused bind (and other bits of
libc++) to stop working. And tests
This fix is needed to support clang 3.5.0 and higher, which are more
strict about forming pointer-to-function types with cv-qualifiers or
ref-qualifiers. See also the upstream PR <http://llvm.org/PR19742> and
<http://llvm.org/viewvc/llvm-project?rev=208825&view=rev>
Reported by: amdmi3
Modified:
stable/9/contrib/libc++/include/type_traits
Directory Properties:
stable/9/contrib/libc++/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/10/contrib/libc++/include/type_traits
Directory Properties:
stable/10/ (props changed)
Modified: stable/9/contrib/libc++/include/type_traits
==============================================================================
--- stable/9/contrib/libc++/include/type_traits Thu Dec 4 01:10:50 2014 (r275471)
+++ stable/9/contrib/libc++/include/type_traits Thu Dec 4 01:21:56 2014 (r275472)
@@ -439,8 +439,26 @@ template <class _Tp> struct _LIBCPP_TYPE
// is_member_function_pointer
-template <class _Tp> struct __libcpp_is_member_function_pointer : public false_type {};
-template <class _Tp, class _Up> struct __libcpp_is_member_function_pointer<_Tp _Up::*> : public is_function<_Tp> {};
+// template <class _Tp> struct __libcpp_is_member_function_pointer : public false_type {};
+// template <class _Tp, class _Up> struct __libcpp_is_member_function_pointer<_Tp _Up::*> : public is_function<_Tp> {};
+//
+
+template <class _MP, bool _IsMemberFuctionPtr, bool _IsMemberObjectPtr>
+struct __member_pointer_traits_imp
+{ // forward declaration; specializations later
+};
+
+
+namespace __libcpp_is_member_function_pointer_imp {
+ template <typename _Tp>
+ char __test(typename std::__member_pointer_traits_imp<_Tp, true, false>::_FnType *);
+
+ template <typename>
+ std::__two __test(...);
+};
+
+template <class _Tp> struct __libcpp_is_member_function_pointer
+ : public integral_constant<bool, sizeof(__libcpp_is_member_function_pointer_imp::__test<_Tp>(nullptr)) == 1> {};
template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_member_function_pointer
: public __libcpp_is_member_function_pointer<typename remove_cv<_Tp>::type> {};
@@ -1593,11 +1611,6 @@ __decay_copy(const _Tp& __t)
#endif
-template <class _MP, bool _IsMemberFuctionPtr, bool _IsMemberObjectPtr>
-struct __member_pointer_traits_imp
-{
-};
-
#ifndef _LIBCPP_HAS_NO_VARIADICS
template <class _Rp, class _Class, class ..._Param>
@@ -1605,6 +1618,7 @@ struct __member_pointer_traits_imp<_Rp (
{
typedef _Class _ClassType;
typedef _Rp _ReturnType;
+ typedef _Rp (_FnType) (_Param...);
};
template <class _Rp, class _Class, class ..._Param>
@@ -1612,6 +1626,7 @@ struct __member_pointer_traits_imp<_Rp (
{
typedef _Class const _ClassType;
typedef _Rp _ReturnType;
+ typedef _Rp (_FnType) (_Param...);
};
template <class _Rp, class _Class, class ..._Param>
@@ -1619,6 +1634,7 @@ struct __member_pointer_traits_imp<_Rp (
{
typedef _Class volatile _ClassType;
typedef _Rp _ReturnType;
+ typedef _Rp (_FnType) (_Param...);
};
template <class _Rp, class _Class, class ..._Param>
@@ -1626,6 +1642,7 @@ struct __member_pointer_traits_imp<_Rp (
{
typedef _Class const volatile _ClassType;
typedef _Rp _ReturnType;
+ typedef _Rp (_FnType) (_Param...);
};
#if __has_feature(cxx_reference_qualified_functions)
@@ -1635,6 +1652,7 @@ struct __member_pointer_traits_imp<_Rp (
{
typedef _Class& _ClassType;
typedef _Rp _ReturnType;
+ typedef _Rp (_FnType) (_Param...);
};
template <class _Rp, class _Class, class ..._Param>
@@ -1642,6 +1660,7 @@ struct __member_pointer_traits_imp<_Rp (
{
typedef _Class const& _ClassType;
typedef _Rp _ReturnType;
+ typedef _Rp (_FnType) (_Param...);
};
template <class _Rp, class _Class, class ..._Param>
@@ -1649,6 +1668,7 @@ struct __member_pointer_traits_imp<_Rp (
{
typedef _Class volatile& _ClassType;
typedef _Rp _ReturnType;
+ typedef _Rp (_FnType) (_Param...);
};
template <class _Rp, class _Class, class ..._Param>
@@ -1656,6 +1676,7 @@ struct __member_pointer_traits_imp<_Rp (
{
typedef _Class const volatile& _ClassType;
typedef _Rp _ReturnType;
+ typedef _Rp (_FnType) (_Param...);
};
template <class _Rp, class _Class, class ..._Param>
@@ -1663,6 +1684,7 @@ struct __member_pointer_traits_imp<_Rp (
{
typedef _Class&& _ClassType;
typedef _Rp _ReturnType;
+ typedef _Rp (_FnType) (_Param...);
};
template <class _Rp, class _Class, class ..._Param>
@@ -1670,6 +1692,7 @@ struct __member_pointer_traits_imp<_Rp (
{
typedef _Class const&& _ClassType;
typedef _Rp _ReturnType;
+ typedef _Rp (_FnType) (_Param...);
};
template <class _Rp, class _Class, class ..._Param>
@@ -1677,6 +1700,7 @@ struct __member_pointer_traits_imp<_Rp (
{
typedef _Class volatile&& _ClassType;
typedef _Rp _ReturnType;
+ typedef _Rp (_FnType) (_Param...);
};
template <class _Rp, class _Class, class ..._Param>
@@ -1684,6 +1708,7 @@ struct __member_pointer_traits_imp<_Rp (
{
typedef _Class const volatile&& _ClassType;
typedef _Rp _ReturnType;
+ typedef _Rp (_FnType) (_Param...);
};
#endif // __has_feature(cxx_reference_qualified_functions)
@@ -1695,6 +1720,7 @@ struct __member_pointer_traits_imp<_Rp (
{
typedef _Class _ClassType;
typedef _Rp _ReturnType;
+ typedef _Rp (_FnType) ();
};
template <class _Rp, class _Class, class _P0>
@@ -1702,6 +1728,7 @@ struct __member_pointer_traits_imp<_Rp (
{
typedef _Class _ClassType;
typedef _Rp _ReturnType;
+ typedef _Rp (_FnType) (_P0);
};
template <class _Rp, class _Class, class _P0, class _P1>
@@ -1709,6 +1736,7 @@ struct __member_pointer_traits_imp<_Rp (
{
typedef _Class _ClassType;
typedef _Rp _ReturnType;
+ typedef _Rp (_FnType) (_P0, _P1);
};
template <class _Rp, class _Class, class _P0, class _P1, class _P2>
@@ -1716,6 +1744,7 @@ struct __member_pointer_traits_imp<_Rp (
{
typedef _Class _ClassType;
typedef _Rp _ReturnType;
+ typedef _Rp (_FnType) (_P0, _P1, _P2);
};
template <class _Rp, class _Class>
@@ -1723,6 +1752,7 @@ struct __member_pointer_traits_imp<_Rp (
{
typedef _Class const _ClassType;
typedef _Rp _ReturnType;
+ typedef _Rp (_FnType) ();
};
template <class _Rp, class _Class, class _P0>
@@ -1730,6 +1760,7 @@ struct __member_pointer_traits_imp<_Rp (
{
typedef _Class const _ClassType;
typedef _Rp _ReturnType;
+ typedef _Rp (_FnType) (_P0);
};
template <class _Rp, class _Class, class _P0, class _P1>
@@ -1737,6 +1768,7 @@ struct __member_pointer_traits_imp<_Rp (
{
typedef _Class const _ClassType;
typedef _Rp _ReturnType;
+ typedef _Rp (_FnType) (_P0, _P1);
};
template <class _Rp, class _Class, class _P0, class _P1, class _P2>
@@ -1744,6 +1776,7 @@ struct __member_pointer_traits_imp<_Rp (
{
typedef _Class const _ClassType;
typedef _Rp _ReturnType;
+ typedef _Rp (_FnType) (_P0, _P1, _P2);
};
template <class _Rp, class _Class>
@@ -1751,6 +1784,7 @@ struct __member_pointer_traits_imp<_Rp (
{
typedef _Class volatile _ClassType;
typedef _Rp _ReturnType;
+ typedef _Rp (_FnType) ();
};
template <class _Rp, class _Class, class _P0>
@@ -1758,6 +1792,7 @@ struct __member_pointer_traits_imp<_Rp (
{
typedef _Class volatile _ClassType;
typedef _Rp _ReturnType;
+ typedef _Rp (_FnType) (_P0);
};
template <class _Rp, class _Class, class _P0, class _P1>
@@ -1765,6 +1800,7 @@ struct __member_pointer_traits_imp<_Rp (
{
typedef _Class volatile _ClassType;
typedef _Rp _ReturnType;
+ typedef _Rp (_FnType) (_P0, _P1);
};
template <class _Rp, class _Class, class _P0, class _P1, class _P2>
@@ -1772,6 +1808,7 @@ struct __member_pointer_traits_imp<_Rp (
{
typedef _Class volatile _ClassType;
typedef _Rp _ReturnType;
+ typedef _Rp (_FnType) (_P0, _P1, _P2);
};
template <class _Rp, class _Class>
@@ -1779,6 +1816,7 @@ struct __member_pointer_traits_imp<_Rp (
{
typedef _Class const volatile _ClassType;
typedef _Rp _ReturnType;
+ typedef _Rp (_FnType) ();
};
template <class _Rp, class _Class, class _P0>
@@ -1786,6 +1824,7 @@ struct __member_pointer_traits_imp<_Rp (
{
typedef _Class const volatile _ClassType;
typedef _Rp _ReturnType;
+ typedef _Rp (_FnType) (_P0);
};
template <class _Rp, class _Class, class _P0, class _P1>
@@ -1793,6 +1832,7 @@ struct __member_pointer_traits_imp<_Rp (
{
typedef _Class const volatile _ClassType;
typedef _Rp _ReturnType;
+ typedef _Rp (_FnType) (_P0, _P1);
};
template <class _Rp, class _Class, class _P0, class _P1, class _P2>
@@ -1800,6 +1840,7 @@ struct __member_pointer_traits_imp<_Rp (
{
typedef _Class const volatile _ClassType;
typedef _Rp _ReturnType;
+ typedef _Rp (_FnType) (_P0, _P1, _P2);
};
#endif // _LIBCPP_HAS_NO_VARIADICS
@@ -1819,6 +1860,7 @@ struct __member_pointer_traits
{
// typedef ... _ClassType;
// typedef ... _ReturnType;
+// typedef ... _FnType;
};
// result_of
@@ -2526,6 +2568,15 @@ template <class _Tp> struct _LIBCPP_TYPE
// is_nothrow_constructible
+#if 0
+template <class _Tp, class... _Args>
+struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_constructible
+ : public integral_constant<bool, __is_nothrow_constructible(_Tp(_Args...))>
+{
+};
+
+#else
+
#ifndef _LIBCPP_HAS_NO_VARIADICS
#if __has_feature(cxx_noexcept)
@@ -2664,6 +2715,7 @@ struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_
};
#endif // _LIBCPP_HAS_NO_VARIADICS
+#endif // __has_feature(is_nothrow_constructible)
// is_nothrow_default_constructible