svn commit: r270416 - head/contrib/libc++/include

[Dimitry Andric]

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