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
This commit is contained in:
parent
5a7d2743bf
commit
33b804ae98
@ -301,7 +301,7 @@ template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY __is_nullptr_t
|
||||
|
||||
#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
|
||||
|
Loading…
x
Reference in New Issue
Block a user