From 5936c1d76ac175bb475a41d22b0cd38325f499d8 Mon Sep 17 00:00:00 2001 From: dim Date: Sat, 23 Aug 2014 15:54:22 +0000 Subject: 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 --- contrib/libc++/include/type_traits | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contrib/libc++') diff --git a/contrib/libc++/include/type_traits b/contrib/libc++/include/type_traits index a97441d..00492b1 100644 --- a/contrib/libc++/include/type_traits +++ b/contrib/libc++/include/type_traits @@ -301,7 +301,7 @@ template struct _LIBCPP_TYPE_VIS_ONLY __is_nullptr_t #if _LIBCPP_STD_VER > 11 template struct _LIBCPP_TYPE_VIS_ONLY is_null_pointer - : public ____is_nullptr_t::type> {}; + : public __libcpp___is_nullptr::type> {}; #endif // is_integral -- cgit v1.1