From owner-svn-src-head@FreeBSD.ORG  Sat Aug 23 15:54:23 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@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 28A157AE;
 Sat, 23 Aug 2014 15:54:23 +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 146A3308D;
 Sat, 23 Aug 2014 15:54:23 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7NFsM5d088284;
 Sat, 23 Aug 2014 15:54:22 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7NFsMkW088283;
 Sat, 23 Aug 2014 15:54:22 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <201408231554.s7NFsMkW088283@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: Sat, 23 Aug 2014 15:54:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270416 - head/contrib/libc++/include
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 23 Aug 2014 15:54:23 -0000

Author: dim
Date: Sat Aug 23 15:54:22 2014
New Revision: 270416
URL: http://svnweb.freebsd.org/changeset/base/270416

Log:
  In r260015, I renamed several identifiers to avoid -Wsystem-header
  warnings.  In r261283, I imported libc++ 3.4 release, but this contained
  one identifier that had not been renamed yet, leading to a compilation
  error when using -std=c++1y.  Fix the compilation error by correctly
  renaming the identifier.
  
  Reported by:	rcarter@pinyon.org
  PR:		base/192139
  MFC after:	3 days

Modified:
  head/contrib/libc++/include/type_traits

Modified: head/contrib/libc++/include/type_traits
==============================================================================
--- head/contrib/libc++/include/type_traits	Sat Aug 23 15:07:09 2014	(r270415)
+++ head/contrib/libc++/include/type_traits	Sat Aug 23 15:54:22 2014	(r270416)
@@ -301,7 +301,7 @@ template <class _Tp> struct _LIBCPP_TYPE
 
 #if _LIBCPP_STD_VER > 11
 template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_null_pointer
-    : public ____is_nullptr_t<typename remove_cv<_Tp>::type> {};
+    : public __libcpp___is_nullptr<typename remove_cv<_Tp>::type> {};
 #endif
 
 // is_integral