From owner-svn-src-stable@FreeBSD.ORG Sat Jan 4 17:22:54 2014 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1E11EA47; Sat, 4 Jan 2014 17:22:54 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0896F1167; Sat, 4 Jan 2014 17:22:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04HMrCh014934; Sat, 4 Jan 2014 17:22:53 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04HMrOU014933; Sat, 4 Jan 2014 17:22:53 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201401041722.s04HMrOU014933@svn.freebsd.org> From: Dimitry Andric Date: Sat, 4 Jan 2014 17:22:53 +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: r260263 - 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@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 17:22:54 -0000 Author: dim Date: Sat Jan 4 17:22:53 2014 New Revision: 260263 URL: http://svnweb.freebsd.org/changeset/base/260263 Log: MFC r260015: In libc++'s type_traits header, avoid warnings (activated by our use of -Wsystem-headers) about potential keyword compatibility problems, by adding a __libcpp prefix to the applicable identifiers. Upstream is still debating about this, but we need it now, to be able to import clang 3.4. 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 Sat Jan 4 17:09:41 2014 (r260262) +++ stable/9/contrib/libc++/include/type_traits Sat Jan 4 17:22:53 2014 (r260263) @@ -280,53 +280,53 @@ template using remove_cv_t = // is_void -template struct __is_void : public false_type {}; -template <> struct __is_void : public true_type {}; +template struct __libcpp_is_void : public false_type {}; +template <> struct __libcpp_is_void : public true_type {}; template struct _LIBCPP_TYPE_VIS is_void - : public __is_void::type> {}; + : public __libcpp_is_void::type> {}; // __is_nullptr_t -template struct ____is_nullptr_t : public false_type {}; -template <> struct ____is_nullptr_t : public true_type {}; +template struct __libcpp___is_nullptr : public false_type {}; +template <> struct __libcpp___is_nullptr : public true_type {}; template struct _LIBCPP_TYPE_VIS __is_nullptr_t - : public ____is_nullptr_t::type> {}; + : public __libcpp___is_nullptr::type> {}; // is_integral -template struct __is_integral : public false_type {}; -template <> struct __is_integral : public true_type {}; -template <> struct __is_integral : public true_type {}; -template <> struct __is_integral : public true_type {}; -template <> struct __is_integral : public true_type {}; -template <> struct __is_integral : public true_type {}; +template struct __libcpp_is_integral : public false_type {}; +template <> struct __libcpp_is_integral : public true_type {}; +template <> struct __libcpp_is_integral : public true_type {}; +template <> struct __libcpp_is_integral : public true_type {}; +template <> struct __libcpp_is_integral : public true_type {}; +template <> struct __libcpp_is_integral : public true_type {}; #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS -template <> struct __is_integral : public true_type {}; -template <> struct __is_integral : public true_type {}; +template <> struct __libcpp_is_integral : public true_type {}; +template <> struct __libcpp_is_integral : public true_type {}; #endif // _LIBCPP_HAS_NO_UNICODE_CHARS -template <> struct __is_integral : public true_type {}; -template <> struct __is_integral : public true_type {}; -template <> struct __is_integral : public true_type {}; -template <> struct __is_integral : public true_type {}; -template <> struct __is_integral : public true_type {}; -template <> struct __is_integral : public true_type {}; -template <> struct __is_integral : public true_type {}; -template <> struct __is_integral : public true_type {}; +template <> struct __libcpp_is_integral : public true_type {}; +template <> struct __libcpp_is_integral : public true_type {}; +template <> struct __libcpp_is_integral : public true_type {}; +template <> struct __libcpp_is_integral : public true_type {}; +template <> struct __libcpp_is_integral : public true_type {}; +template <> struct __libcpp_is_integral : public true_type {}; +template <> struct __libcpp_is_integral : public true_type {}; +template <> struct __libcpp_is_integral : public true_type {}; template struct _LIBCPP_TYPE_VIS is_integral - : public __is_integral::type> {}; + : public __libcpp_is_integral::type> {}; // is_floating_point -template struct __is_floating_point : public false_type {}; -template <> struct __is_floating_point : public true_type {}; -template <> struct __is_floating_point : public true_type {}; -template <> struct __is_floating_point : public true_type {}; +template struct __libcpp_is_floating_point : public false_type {}; +template <> struct __libcpp_is_floating_point : public true_type {}; +template <> struct __libcpp_is_floating_point : public true_type {}; +template <> struct __libcpp_is_floating_point : public true_type {}; template struct _LIBCPP_TYPE_VIS is_floating_point - : public __is_floating_point::type> {}; + : public __libcpp_is_floating_point::type> {}; // is_array @@ -339,11 +339,11 @@ template struct // is_pointer -template struct __is_pointer : public false_type {}; -template struct __is_pointer<_Tp*> : public true_type {}; +template struct __libcpp_is_pointer : public false_type {}; +template struct __libcpp_is_pointer<_Tp*> : public true_type {}; template struct _LIBCPP_TYPE_VIS is_pointer - : public __is_pointer::type> {}; + : public __libcpp_is_pointer::type> {}; // is_reference @@ -419,29 +419,29 @@ template ::value || is_reference<_Tp>::value || is_same<_Tp, nullptr_t>::value > -struct __is_function +struct __libcpp_is_function : public integral_constant(__is_function_imp::__source<_Tp>())) == 1> {}; -template struct __is_function<_Tp, true> : public false_type {}; +template struct __libcpp_is_function<_Tp, true> : public false_type {}; template struct _LIBCPP_TYPE_VIS is_function - : public __is_function<_Tp> {}; + : public __libcpp_is_function<_Tp> {}; // is_member_function_pointer -template struct __is_member_function_pointer : public false_type {}; -template struct __is_member_function_pointer<_Tp _Up::*> : public is_function<_Tp> {}; +template struct __libcpp_is_member_function_pointer : public false_type {}; +template struct __libcpp_is_member_function_pointer<_Tp _Up::*> : public is_function<_Tp> {}; template struct _LIBCPP_TYPE_VIS is_member_function_pointer - : public __is_member_function_pointer::type> {}; + : public __libcpp_is_member_function_pointer::type> {}; // is_member_pointer -template struct __is_member_pointer : public false_type {}; -template struct __is_member_pointer<_Tp _Up::*> : public true_type {}; +template struct __libcpp_is_member_pointer : public false_type {}; +template struct __libcpp_is_member_pointer<_Tp _Up::*> : public true_type {}; template struct _LIBCPP_TYPE_VIS is_member_pointer - : public __is_member_pointer::type> {}; + : public __libcpp_is_member_pointer::type> {}; // is_member_object_pointer @@ -640,11 +640,11 @@ template struct ___is_signed<_Tp, false> : public true_type {}; // floating point template ::value> -struct __is_signed : public ___is_signed<_Tp> {}; +struct __libcpp_is_signed : public ___is_signed<_Tp> {}; -template struct __is_signed<_Tp, false> : public false_type {}; +template struct __libcpp_is_signed<_Tp, false> : public false_type {}; -template struct _LIBCPP_TYPE_VIS is_signed : public __is_signed<_Tp> {}; +template struct _LIBCPP_TYPE_VIS is_signed : public __libcpp_is_signed<_Tp> {}; // is_unsigned @@ -655,11 +655,11 @@ template struct ___is_unsigned<_Tp, false> : public false_type {}; // floating point template ::value> -struct __is_unsigned : public ___is_unsigned<_Tp> {}; +struct __libcpp_is_unsigned : public ___is_unsigned<_Tp> {}; -template struct __is_unsigned<_Tp, false> : public false_type {}; +template struct __libcpp_is_unsigned<_Tp, false> : public false_type {}; -template struct _LIBCPP_TYPE_VIS is_unsigned : public __is_unsigned<_Tp> {}; +template struct _LIBCPP_TYPE_VIS is_unsigned : public __libcpp_is_unsigned<_Tp> {}; // rank