svn commit: r270646 - in stable: 10/contrib/libc++/include 9/contrib/libc++/include

[Dimitry Andric]

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 at 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