From owner-svn-src-stable-9@FreeBSD.ORG  Tue Aug 26 06:31:52 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 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id CC38E5DC;
 Tue, 26 Aug 2014 06:31:52 +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 B6F543D59;
 Tue, 26 Aug 2014 06:31:52 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7Q6VqC7098293;
 Tue, 26 Aug 2014 06:31:52 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7Q6VqAZ098292;
 Tue, 26 Aug 2014 06:31:52 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <201408260631.s7Q6VqAZ098292@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: Tue, 26 Aug 2014 06:31:52 +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: r270646 - 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: Tue, 26 Aug 2014 06:31:52 -0000

Author: dim
Date: Tue Aug 26 06:31:52 2014
New Revision: 270646
URL: http://svnweb.freebsd.org/changeset/base/270646

Log:
  MFC r270416:
  
  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

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	Tue Aug 26 03:45:54 2014	(r270645)
+++ stable/9/contrib/libc++/include/type_traits	Tue Aug 26 06:31:52 2014	(r270646)
@@ -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