diff options
| author | dim <dim@FreeBSD.org> | 2014-08-26 06:31:52 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2014-08-26 06:31:52 +0000 |
| commit | 60a236916672c4bce4522b35e3ee007fd7eb1146 (patch) | |
| tree | a6fc1b4b1e948f6694df31eb1ad0e945997e0820 /contrib/libc++ | |
| parent | d577d2038d3ded10c7cfb829d8ede49485b513b0 (diff) | |
| download | FreeBSD-src-60a236916672c4bce4522b35e3ee007fd7eb1146.zip FreeBSD-src-60a236916672c4bce4522b35e3ee007fd7eb1146.tar.gz | |
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
Diffstat (limited to 'contrib/libc++')
| -rw-r--r-- | contrib/libc++/include/type_traits | 2 |
1 files changed, 1 insertions, 1 deletions
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 <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 |
