diff options
author | decke <decke@FreeBSD.org> | 2013-10-06 10:12:11 +0000 |
---|---|---|
committer | decke <decke@FreeBSD.org> | 2013-10-06 10:12:11 +0000 |
commit | cd8e388205dab0c6cdfbd5884ca0f3127fe71ed5 (patch) | |
tree | da7f2a4ec1fa059af97d5e6330b21dbab8d571b7 /contrib/libc++/include | |
parent | 1a04bcfbb69c67f949cb1426a4031cdb4033c568 (diff) | |
download | FreeBSD-src-cd8e388205dab0c6cdfbd5884ca0f3127fe71ed5.zip FreeBSD-src-cd8e388205dab0c6cdfbd5884ca0f3127fe71ed5.tar.gz |
ename internal function test() to avoid name clashes with
common macros. This fixes ports like mysql 5.6 which has an
internal macro called test.
Approved by: re (gjb)
Discussed with: theraven
Diffstat (limited to 'contrib/libc++/include')
-rw-r--r-- | contrib/libc++/include/memory | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/libc++/include/memory b/contrib/libc++/include/memory index ffd0cd0..3451546 100644 --- a/contrib/libc++/include/memory +++ b/contrib/libc++/include/memory @@ -965,13 +965,13 @@ public: namespace __has_pointer_type_imp { - template <class _Up> static __two test(...); - template <class _Up> static char test(typename _Up::pointer* = 0); + template <class _Up> static __two __test(...); + template <class _Up> static char __test(typename _Up::pointer* = 0); } template <class _Tp> struct __has_pointer_type - : public integral_constant<bool, sizeof(__has_pointer_type_imp::test<_Tp>(0)) == 1> + : public integral_constant<bool, sizeof(__has_pointer_type_imp::__test<_Tp>(0)) == 1> { }; |